diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj
index b0af11cb..7e0e5537 100644
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -511,6 +511,7 @@
 		4C7989EF2D195277006AE07B /* RoomModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7989EE2D195277006AE07B /* RoomModeViewController.m */; };
 		4C7989F32D1952DA006AE07B /* RoomModePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7989F22D1952DA006AE07B /* RoomModePresenter.m */; };
 		4C815A172CFEB758002A46A6 /* SuperBlockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */; };
+		4CB753D22D30F10900B13DF5 /* LuckyPackageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */; };
 		4CC6195A2CEC7770008C1EE8 /* MyDressingDataPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */; };
 		4CC6195D2CEC996E008C1EE8 /* MyDressingDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */; };
 		4CE3A9462D22754C003F0796 /* RechargeUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE3A9452D22754C003F0796 /* RechargeUserModel.m */; };
@@ -2626,6 +2627,8 @@
 		4C7989F22D1952DA006AE07B /* RoomModePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomModePresenter.m; sourceTree = "<group>"; };
 		4C815A152CFEB758002A46A6 /* SuperBlockViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SuperBlockViewController.h; sourceTree = "<group>"; };
 		4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SuperBlockViewController.m; sourceTree = "<group>"; };
+		4CB753D02D30F10900B13DF5 /* LuckyPackageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageViewController.h; sourceTree = "<group>"; };
+		4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageViewController.m; sourceTree = "<group>"; };
 		4CC619582CEC7770008C1EE8 /* MyDressingDataPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingDataPresent.h; sourceTree = "<group>"; };
 		4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingDataPresent.m; sourceTree = "<group>"; };
 		4CC6195B2CEC996E008C1EE8 /* MyDressingDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingDataModel.h; sourceTree = "<group>"; };
@@ -6670,6 +6673,24 @@
 			path = RoomMode;
 			sourceTree = "<group>";
 		};
+		4CB753CE2D2FE80100B13DF5 /* RoomSideMenu */ = {
+			isa = PBXGroup;
+			children = (
+				4C44BD5B2D151B5C00F321FA /* RoomSideMenu.h */,
+				4C44BD5C2D151B5C00F321FA /* RoomSideMenu.m */,
+			);
+			path = RoomSideMenu;
+			sourceTree = "<group>";
+		};
+		4CB753CF2D30F08E00B13DF5 /* LuckyPackage */ = {
+			isa = PBXGroup;
+			children = (
+				4CB753D02D30F10900B13DF5 /* LuckyPackageViewController.h */,
+				4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */,
+			);
+			path = LuckyPackage;
+			sourceTree = "<group>";
+		};
 		54283CE22CE48884009729B5 /* ShoppingMall */ = {
 			isa = PBXGroup;
 			children = (
@@ -10504,6 +10525,8 @@
 		E8AEAED8271413530017FCE0 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				4CB753CF2D30F08E00B13DF5 /* LuckyPackage */,
+				4CB753CE2D2FE80100B13DF5 /* RoomSideMenu */,
 				547080D82CD0EE7A009879E5 /* Custom Background */,
 				239D0F932BFB3284002977CE /* MSRoomOnLineView */,
 				E880B396278BD3D800A83B0D /* AcrossRoomPK */,
@@ -10576,8 +10599,6 @@
 				235A45192B04A352009753F5 /* PIRoomActivityWebView.m */,
 				235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */,
 				235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */,
-				4C44BD5B2D151B5C00F321FA /* RoomSideMenu.h */,
-				4C44BD5C2D151B5C00F321FA /* RoomSideMenu.m */,
 			);
 			path = ActivityContainerView;
 			sourceTree = "<group>";
@@ -11910,6 +11931,7 @@
 				E84843AF27F59E7E0050D365 /* XPRoomPKResultView.m in Sources */,
 				E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */,
 				E86A16C52856DBEC004228B8 /* FindNewGreetListModel.m in Sources */,
+				4CB753D22D30F10900B13DF5 /* LuckyPackageViewController.m in Sources */,
 				2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */,
 				54E82EA22CA6886700C931D9 /* RoomBoomBannerAnimation.m in Sources */,
 				E81366F826F0C12A0076364C /* LoginFullInfoProtocol.h in Sources */,
diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
index bcccb8e0..ad9a4638 100644
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -79,7 +79,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/YuMi/Assets.xcassets/20.20.50/Contents.json b/YuMi/Assets.xcassets/20.20.50/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/Contents.json
similarity index 86%
rename from YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/Contents.json
rename to YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/Contents.json
index 620ca58f..c293d316 100644
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/Contents.json	
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x 2.png",
+      "filename" : "zz 拷贝 2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/zz 拷贝 2@3x.png b/YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/zz 拷贝 2@3x.png
new file mode 100644
index 00000000..574a4e79
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/zz 拷贝 2.imageset/zz 拷贝 2@3x.png differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/Contents.json
similarity index 87%
rename from YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/Contents.json
rename to YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/Contents.json
index d8ff21eb..f073b34e 100644
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/Contents.json	
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x.png",
+      "filename" : "zz 拷贝@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/zz 拷贝@3x.png b/YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/zz 拷贝@3x.png
new file mode 100644
index 00000000..22ee925b
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/zz 拷贝.imageset/zz 拷贝@3x.png differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/图层 34.imageset/Contents.json
similarity index 86%
rename from YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/Contents.json
rename to YuMi/Assets.xcassets/20.20.50/图层 34.imageset/Contents.json
index 796af55c..eca52821 100644
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/20.20.50/图层 34.imageset/Contents.json	
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x (1).png",
+      "filename" : "图层 34@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/20.20.50/图层 34.imageset/图层 34@3x.png b/YuMi/Assets.xcassets/20.20.50/图层 34.imageset/图层 34@3x.png
new file mode 100644
index 00000000..a9b85455
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/图层 34.imageset/图层 34@3x.png differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/框 1.imageset/Contents.json
similarity index 77%
rename from YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/Contents.json
rename to YuMi/Assets.xcassets/20.20.50/框 1.imageset/Contents.json
index ca64d1a3..856b9ec9 100644
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/20.20.50/框 1.imageset/Contents.json	
@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "示例图@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x.png",
+      "filename" : "框@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/20.20.50/框 1.imageset/框@3x.png b/YuMi/Assets.xcassets/20.20.50/框 1.imageset/框@3x.png
new file mode 100644
index 00000000..5dc8094f
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/框 1.imageset/框@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/框.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/框.imageset/Contents.json
new file mode 100644
index 00000000..856b9ec9
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/框.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "框@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/框.imageset/框@3x.png b/YuMi/Assets.xcassets/20.20.50/框.imageset/框@3x.png
new file mode 100644
index 00000000..2f4cf471
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/框.imageset/框@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/Contents.json
new file mode 100644
index 00000000..d2aea8ef
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "画板 3@3x (1).png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/画板 3@3x (1).png b/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/画板 3@3x (1).png
new file mode 100644
index 00000000..5b093dc9
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/画板 3 (1).imageset/画板 3@3x (1).png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/Contents.json
new file mode 100644
index 00000000..c93bd4e7
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "画板 3@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/画板 3@3x.png b/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/画板 3@3x.png
new file mode 100644
index 00000000..5625727e
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/画板 3.imageset/画板 3@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/Contents.json
new file mode 100644
index 00000000..f2c3cb4e
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 1@3x(1).png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/组 1@3x(1).png b/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/组 1@3x(1).png
new file mode 100644
index 00000000..f2a1e815
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 1(1).imageset/组 1@3x(1).png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 1.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 1.imageset/Contents.json
new file mode 100644
index 00000000..761c271b
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 1.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 1.imageset/组 1@3x.png b/YuMi/Assets.xcassets/20.20.50/组 1.imageset/组 1@3x.png
new file mode 100644
index 00000000..f86d2b96
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 1.imageset/组 1@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 11.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 11.imageset/Contents.json
new file mode 100644
index 00000000..ffe643a1
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 11.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 11@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 11.imageset/组 11@3x.png b/YuMi/Assets.xcassets/20.20.50/组 11.imageset/组 11@3x.png
new file mode 100644
index 00000000..8f6a0dd6
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 11.imageset/组 11@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 12.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 12.imageset/Contents.json
new file mode 100644
index 00000000..ffe643a1
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 12.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 11@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 12.imageset/组 11@3x.png b/YuMi/Assets.xcassets/20.20.50/组 12.imageset/组 11@3x.png
new file mode 100644
index 00000000..8f6a0dd6
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 12.imageset/组 11@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 120.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 120.imageset/Contents.json
new file mode 100644
index 00000000..43c44579
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 120.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 120@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 120.imageset/组 120@3x.png b/YuMi/Assets.xcassets/20.20.50/组 120.imageset/组 120@3x.png
new file mode 100644
index 00000000..4211a1fd
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 120.imageset/组 120@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 121.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 121.imageset/Contents.json
new file mode 100644
index 00000000..43c44579
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 121.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 120@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 121.imageset/组 120@3x.png b/YuMi/Assets.xcassets/20.20.50/组 121.imageset/组 120@3x.png
new file mode 100644
index 00000000..fa43f3e1
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 121.imageset/组 120@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/组 4.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/组 4.imageset/Contents.json
new file mode 100644
index 00000000..1450d519
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/组 4.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "组 4@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/组 4.imageset/组 4@3x.png b/YuMi/Assets.xcassets/20.20.50/组 4.imageset/组 4@3x.png
new file mode 100644
index 00000000..e5efc0c1
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/组 4.imageset/组 4@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/Contents.json
new file mode 100644
index 00000000..7ae8f130
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "缺省@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/缺省@3x.png b/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/缺省@3x.png
new file mode 100644
index 00000000..258a8e1d
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/缺省 1.imageset/缺省@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/缺省.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/缺省.imageset/Contents.json
new file mode 100644
index 00000000..7ae8f130
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/缺省.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "缺省@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/缺省.imageset/缺省@3x.png b/YuMi/Assets.xcassets/20.20.50/缺省.imageset/缺省@3x.png
new file mode 100644
index 00000000..0a93e5ef
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/缺省.imageset/缺省@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/Contents.json
new file mode 100644
index 00000000..15b6c5d3
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "规则 拷贝@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/规则 拷贝@3x.png b/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/规则 拷贝@3x.png
new file mode 100644
index 00000000..8b52e24f
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/规则 拷贝.imageset/规则 拷贝@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/规则.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/规则.imageset/Contents.json
new file mode 100644
index 00000000..df1faf36
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/规则.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "规则@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/规则.imageset/规则@3x.png b/YuMi/Assets.xcassets/20.20.50/规则.imageset/规则@3x.png
new file mode 100644
index 00000000..c9e46f1d
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/规则.imageset/规则@3x.png differ
diff --git a/YuMi/Assets.xcassets/20.20.50/返回.imageset/Contents.json b/YuMi/Assets.xcassets/20.20.50/返回.imageset/Contents.json
new file mode 100644
index 00000000..3d0e7fe5
--- /dev/null
+++ b/YuMi/Assets.xcassets/20.20.50/返回.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "返回@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/20.20.50/返回.imageset/返回@3x.png b/YuMi/Assets.xcassets/20.20.50/返回.imageset/返回@3x.png
new file mode 100644
index 00000000..e773b7a6
Binary files /dev/null and b/YuMi/Assets.xcassets/20.20.50/返回.imageset/返回@3x.png differ
diff --git a/YuMi/Assets.xcassets/Login/login_apple.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_apple.imageset/Contents.json
index 9c2d1230..25385073 100644
--- a/YuMi/Assets.xcassets/Login/login_apple.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_apple.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_apple@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_apple.imageset/login_apple@2x.png b/YuMi/Assets.xcassets/Login/login_apple.imageset/login_apple@2x.png
deleted file mode 100644
index a358be29..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_apple.imageset/login_apple@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/Contents.json
index 2130df9f..ec0dac97 100644
--- a/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_area_arrow@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/login_area_arrow@2x.png b/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/login_area_arrow@2x.png
deleted file mode 100644
index b510a7a9..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_area_arrow.imageset/login_area_arrow@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_arrow.imageset/Contents.json
index c3233654..55cbe5e0 100644
--- a/YuMi/Assets.xcassets/Login/login_arrow.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_arrow.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_arrow@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_arrow.imageset/login_arrow@2x.png b/YuMi/Assets.xcassets/Login/login_arrow.imageset/login_arrow@2x.png
deleted file mode 100644
index 046278bb..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_arrow.imageset/login_arrow@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/Contents.json
index 25035935..2b3a2312 100644
--- a/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_auth_bubble@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/login_auth_bubble@2x.png b/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/login_auth_bubble@2x.png
deleted file mode 100644
index 8ca49438..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_auth_bubble.imageset/login_auth_bubble@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/Contents.json
index 08a20baf..a42a649e 100644
--- a/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_bind_phone_success@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/login_bind_phone_success@2x.png b/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/login_bind_phone_success@2x.png
deleted file mode 100644
index ba8b4374..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_bind_phone_success.imageset/login_bind_phone_success@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_button.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_button.imageset/Contents.json
index 34cab090..3f454478 100644
--- a/YuMi/Assets.xcassets/Login/login_button.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_button.imageset/Contents.json
@@ -1,22 +1,21 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_button@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_button@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_button@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/Login/login_button.imageset/login_button@2x.png b/YuMi/Assets.xcassets/Login/login_button.imageset/login_button@2x.png
deleted file mode 100644
index 886ad950..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_button.imageset/login_button@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_button_sel.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_button_sel.imageset/Contents.json
index eb3d25d7..e41efee4 100644
--- a/YuMi/Assets.xcassets/Login/login_button_sel.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_button_sel.imageset/Contents.json
@@ -1,22 +1,21 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_button_sel@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "login_button_sel@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "login_button_sel@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/YuMi/Assets.xcassets/Login/login_button_sel.imageset/login_button_sel@2x.png b/YuMi/Assets.xcassets/Login/login_button_sel.imageset/login_button_sel@2x.png
deleted file mode 100644
index bd176f0d..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_button_sel.imageset/login_button_sel@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@2x.png b/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@2x.png
deleted file mode 100644
index 1bedf871..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@3x.png b/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@3x.png
deleted file mode 100644
index be2466e6..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/ChinaMobile_icon@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/Contents.json
deleted file mode 100644
index 9887a543..00000000
--- a/YuMi/Assets.xcassets/Login/login_china_mobile.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ChinaMobile_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ChinaMobile_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/Contents.json
index 50a79107..2a629964 100644
--- a/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_choose_phone_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/login_choose_phone_bg@2x.png b/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/login_choose_phone_bg@2x.png
deleted file mode 100644
index 61348441..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_choose_phone_bg.imageset/login_choose_phone_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/Contents.json
index eb732193..b065e386 100644
--- a/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_choose_pwd_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/login_choose_pwd_bg@2x.png b/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/login_choose_pwd_bg@2x.png
deleted file mode 100644
index 02e6aa79..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_choose_pwd_bg.imageset/login_choose_pwd_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/Contents.json
deleted file mode 100644
index 81068c12..00000000
--- a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ctmobile_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ctmobile_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@2x.png b/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@2x.png
deleted file mode 100644
index ff8d8ee5..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@3x.png b/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@3x.png
deleted file mode 100644
index de9eef63..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_ct_mobile.imageset/ctmobile_icon@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_facebook.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_facebook.imageset/Contents.json
index e7992905..54be858d 100644
--- a/YuMi/Assets.xcassets/Login/login_facebook.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_facebook.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_facebook@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_facebook.imageset/login_facebook@2x.png b/YuMi/Assets.xcassets/Login/login_facebook.imageset/login_facebook@2x.png
deleted file mode 100644
index 4a63f94a..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_facebook.imageset/login_facebook@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/Contents.json
index 2af2952b..dbf12d37 100644
--- a/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_forget_password_hidden@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/login_forget_password_hidden@2x.png b/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/login_forget_password_hidden@2x.png
deleted file mode 100644
index 83ef5198..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_forget_password_hidden.imageset/login_forget_password_hidden@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/Contents.json
index f970aea6..759101bc 100644
--- a/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_forget_password_show@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/login_forget_password_show@2x.png b/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/login_forget_password_show@2x.png
deleted file mode 100644
index bd159a95..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_forget_password_show.imageset/login_forget_password_show@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_full_female.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_full_female.imageset/Contents.json
index 64803feb..30909766 100644
--- a/YuMi/Assets.xcassets/Login/login_full_female.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_full_female.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_full_female@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_full_female.imageset/login_full_female@2x.png b/YuMi/Assets.xcassets/Login/login_full_female.imageset/login_full_female@2x.png
deleted file mode 100644
index 2b072a00..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_full_female.imageset/login_full_female@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/Contents.json
index f22ab848..ac64edfc 100644
--- a/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_full_female_logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/login_full_female_logo@2x.png b/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/login_full_female_logo@2x.png
deleted file mode 100644
index dc340392..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/login_full_female_logo@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/Contents.json
index 1d37eb76..3eda5f49 100644
--- a/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_full_info_refresh@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/login_full_info_refresh@2x.png b/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/login_full_info_refresh@2x.png
deleted file mode 100644
index 6f59adb5..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_full_info_refresh.imageset/login_full_info_refresh@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_full_male.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_full_male.imageset/Contents.json
index 8f4f0553..47dd92ce 100644
--- a/YuMi/Assets.xcassets/Login/login_full_male.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_full_male.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_full_male@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_full_male.imageset/login_full_male@2x.png b/YuMi/Assets.xcassets/Login/login_full_male.imageset/login_full_male@2x.png
deleted file mode 100644
index 6490b8dc..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_full_male.imageset/login_full_male@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/Contents.json
index 64454c3f..5f55bdab 100644
--- a/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_full_male_logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/login_full_male_logo@2x.png b/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/login_full_male_logo@2x.png
deleted file mode 100644
index 527b140b..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/login_full_male_logo@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_gmail.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_gmail.imageset/Contents.json
index 40af4f62..775f1731 100644
--- a/YuMi/Assets.xcassets/Login/login_gmail.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_gmail.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_gmail@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_gmail.imageset/login_gmail@2x.png b/YuMi/Assets.xcassets/Login/login_gmail.imageset/login_gmail@2x.png
deleted file mode 100644
index 07646727..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_gmail.imageset/login_gmail@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_line.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_line.imageset/Contents.json
index 346120e9..f4d62cc1 100644
--- a/YuMi/Assets.xcassets/Login/login_line.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_line.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_line@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_line.imageset/login_line@2x.png b/YuMi/Assets.xcassets/Login/login_line.imageset/login_line@2x.png
deleted file mode 100644
index d61bb3a3..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_line.imageset/login_line@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_next.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_next.imageset/Contents.json
index fafebf67..8e0d8540 100644
--- a/YuMi/Assets.xcassets/Login/login_next.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_next.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_next@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_next.imageset/login_next@2x.png b/YuMi/Assets.xcassets/Login/login_next.imageset/login_next@2x.png
deleted file mode 100644
index dfd7e03b..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_next.imageset/login_next@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_next_disable.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_next_disable.imageset/Contents.json
index db9d5f87..cbeb4d64 100644
--- a/YuMi/Assets.xcassets/Login/login_next_disable.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_next_disable.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_next_disable@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_next_disable.imageset/login_next_disable@2x.png b/YuMi/Assets.xcassets/Login/login_next_disable.imageset/login_next_disable@2x.png
deleted file mode 100644
index 9f2e356f..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_next_disable.imageset/login_next_disable@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_next_login.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_next_login.imageset/Contents.json
index 51522967..22d12c81 100644
--- a/YuMi/Assets.xcassets/Login/login_next_login.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_next_login.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_next_login@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_next_login.imageset/login_next_login@2x.png b/YuMi/Assets.xcassets/Login/login_next_login.imageset/login_next_login@2x.png
deleted file mode 100644
index b9b2c380..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_next_login.imageset/login_next_login@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/Contents.json
index e5e5b576..f9f16aa2 100644
--- a/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_phone_pwd_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/login_phone_pwd_bg@2x.png b/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/login_phone_pwd_bg@2x.png
deleted file mode 100644
index 80e1532b..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/login_phone_pwd_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_phone_type.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_phone_type.imageset/Contents.json
index c3254aeb..4f0668d3 100644
--- a/YuMi/Assets.xcassets/Login/login_phone_type.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_phone_type.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_phone_type@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_phone_type.imageset/login_phone_type@2x.png b/YuMi/Assets.xcassets/Login/login_phone_type.imageset/login_phone_type@2x.png
deleted file mode 100644
index 346ddc3b..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_phone_type.imageset/login_phone_type@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_phone_white.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_phone_white.imageset/Contents.json
index d2c6c6ec..fb72fa7d 100644
--- a/YuMi/Assets.xcassets/Login/login_phone_white.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_phone_white.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_phone_white@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_phone_white.imageset/login_phone_white@2x.png b/YuMi/Assets.xcassets/Login/login_phone_white.imageset/login_phone_white@2x.png
deleted file mode 100644
index ae1a9451..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_phone_white.imageset/login_phone_white@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_quick_next.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_quick_next.imageset/Contents.json
index 1c59d261..c7cef328 100644
--- a/YuMi/Assets.xcassets/Login/login_quick_next.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_quick_next.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_quick_next@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_quick_next.imageset/login_quick_next@2x.png b/YuMi/Assets.xcassets/Login/login_quick_next.imageset/login_quick_next@2x.png
deleted file mode 100644
index c512d405..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_quick_next.imageset/login_quick_next@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/Contents.json b/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/Contents.json
index 7aeb2387..876de259 100644
--- a/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "unicomMobile_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/unicomMobile_icon@2x.png b/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/unicomMobile_icon@2x.png
deleted file mode 100644
index df028038..00000000
Binary files a/YuMi/Assets.xcassets/Login/login_unicom_mobile.imageset/unicomMobile_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json
index 12314818..f0a2352f 100644
--- a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "pi_app_login_new_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png
deleted file mode 100644
index ece81545..00000000
Binary files a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/Contents.json
deleted file mode 100644
index 8a5773df..00000000
--- a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "mine_dynamic@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "mine_dynamic@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@2x.png b/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@2x.png
deleted file mode 100644
index ba002e41..00000000
Binary files a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@3x.png b/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@3x.png
deleted file mode 100644
index d62d1fb5..00000000
Binary files a/YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/mine_dynamic@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/moment_camera.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/moment_camera.imageset/Contents.json
index 6e835c8b..fcd5fc2f 100644
--- a/YuMi/Assets.xcassets/Monents/moment_camera.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/moment_camera.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "moment_camera@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/moment_camera.imageset/moment_camera@2x.png b/YuMi/Assets.xcassets/Monents/moment_camera.imageset/moment_camera@2x.png
deleted file mode 100644
index 7ce01dce..00000000
Binary files a/YuMi/Assets.xcassets/Monents/moment_camera.imageset/moment_camera@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/Contents.json
index d0222773..62dc460e 100644
--- a/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_common_landLordFlag@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/monents_common_landLordFlag@2x.png b/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/monents_common_landLordFlag@2x.png
deleted file mode 100644
index 6d91510b..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_common_landLordFlag.imageset/monents_common_landLordFlag@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/Contents.json
index 027a0a6a..6e8b8338 100644
--- a/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_info_like_share@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/monents_info_like_share@2x.png b/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/monents_info_like_share@2x.png
deleted file mode 100644
index 26e38fce..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_info_like_share.imageset/monents_info_like_share@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/Contents.json
index 317cc315..3aa6a6d4 100644
--- a/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_info_top@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/monents_info_top@2x.png b/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/monents_info_top@2x.png
deleted file mode 100644
index 1dab13a1..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_info_top.imageset/monents_info_top@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/Contents.json
index 7fd758f7..5a9ec158 100644
--- a/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_info_topic_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/monents_info_topic_icon@2x.png b/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/monents_info_topic_icon@2x.png
deleted file mode 100644
index 669a17e9..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_info_topic_icon.imageset/monents_info_topic_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/Contents.json
index d2bfc256..3521157b 100644
--- a/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_interactive_delete_message@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/monents_interactive_delete_message@2x.png b/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/monents_interactive_delete_message@2x.png
deleted file mode 100644
index 6dbc4069..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_interactive_delete_message.imageset/monents_interactive_delete_message@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/Contents.json
index 51def40b..e7ba82fe 100644
--- a/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_nav_interavtive_message@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/monents_nav_interavtive_message@2x.png b/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/monents_nav_interavtive_message@2x.png
deleted file mode 100644
index 3fba2664..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_nav_interavtive_message.imageset/monents_nav_interavtive_message@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/Contents.json
index 77998810..d4ac4d6d 100644
--- a/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_on_line_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/monents_on_line_bg@2x.png b/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/monents_on_line_bg@2x.png
deleted file mode 100644
index 9f42cc4c..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/monents_on_line_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/Contents.json
index 7aa28d85..47da5f72 100644
--- a/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_on_line_note@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/monents_on_line_note@2x.png b/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/monents_on_line_note@2x.png
deleted file mode 100644
index ff4960d3..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/monents_on_line_note@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_publish.imageset/Contents.json
index 5d8076e0..75e84496 100644
--- a/YuMi/Assets.xcassets/Monents/monents_publish.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_publish.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_publish@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish.imageset/monents_publish@2x.png b/YuMi/Assets.xcassets/Monents/monents_publish.imageset/monents_publish@2x.png
deleted file mode 100644
index f912e35f..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_publish.imageset/monents_publish@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/Contents.json
index 8bee35df..50eceadf 100644
--- a/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_publish_album_delete@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/monents_publish_album_delete@2x.png b/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/monents_publish_album_delete@2x.png
deleted file mode 100644
index 934db9e4..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_publish_album_delete.imageset/monents_publish_album_delete@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/Contents.json
index 879f91ed..ec898be4 100644
--- a/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_publish_delete@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/monents_publish_delete@2x.png b/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/monents_publish_delete@2x.png
deleted file mode 100644
index e0f76790..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_publish_delete.imageset/monents_publish_delete@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/Contents.json
index 31289eea..1c13a618 100644
--- a/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_publish_success_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/monents_publish_success_icon@2x.png b/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/monents_publish_success_icon@2x.png
deleted file mode 100644
index ec4ddb06..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_publish_success_icon.imageset/monents_publish_success_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/Contents.json b/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/Contents.json
index 8e6f8ea0..4cedbb22 100644
--- a/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "monents_topic_camera@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/monents_topic_camera@2x.png b/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/monents_topic_camera@2x.png
deleted file mode 100644
index 38314013..00000000
Binary files a/YuMi/Assets.xcassets/Monents/monents_topic_camera.imageset/monents_topic_camera@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/Contents.json
index fa13b9e9..f1d25914 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_begin_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/ms_room_game_begin_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/ms_room_game_begin_bg@2x.png
deleted file mode 100644
index c7774f46..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/ms_room_game_begin_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/Contents.json
index a3704b95..4474db5f 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_begin_btn_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/ms_room_game_begin_btn_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/ms_room_game_begin_btn_bg@2x.png
deleted file mode 100644
index c684c554..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/ms_room_game_begin_btn_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/Contents.json
index 9a88fe74..3d3bb1c6 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_begin_rule_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/ms_room_game_begin_rule_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/ms_room_game_begin_rule_icon@2x.png
deleted file mode 100644
index 502c004f..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/ms_room_game_begin_rule_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/Contents.json
index 5b4ed221..8220a717 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_classic_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/ms_room_game_classic_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/ms_room_game_classic_icon@2x.png
deleted file mode 100644
index 4a1fff75..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/ms_room_game_classic_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/Contents.json
index 7b72a87d..32722961 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_quick_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/ms_room_game_quick_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/ms_room_game_quick_icon@2x.png
deleted file mode 100644
index e8a070c4..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_quick_icon.imageset/ms_room_game_quick_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/Contents.json
index e160c736..9f3485d5 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_sub_begin_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/ms_room_game_sub_begin_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/ms_room_game_sub_begin_bg@2x.png
deleted file mode 100644
index fe8724a1..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_sub_begin_bg.imageset/ms_room_game_sub_begin_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/Contents.json
index ec1ef512..1c74debb 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_underwa_back_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/ms_room_game_underwa_back_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/ms_room_game_underwa_back_icon@2x.png
deleted file mode 100644
index fa1c52af..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_back_icon.imageset/ms_room_game_underwa_back_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/Contents.json
index 567fb8bf..3cde74cd 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_underwa_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/ms_room_game_underwa_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/ms_room_game_underwa_bg@2x.png
deleted file mode 100644
index 265fb8ee..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_bg.imageset/ms_room_game_underwa_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/Contents.json
index 87cc2e17..08820fae 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_underwa_border@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/ms_room_game_underwa_border@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/ms_room_game_underwa_border@2x.png
deleted file mode 100644
index 5a01925c..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_border.imageset/ms_room_game_underwa_border@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/Contents.json
index cf405e63..5560bca6 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_underwa_pk_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/ms_room_game_underwa_pk_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/ms_room_game_underwa_pk_bg@2x.png
deleted file mode 100644
index 41536705..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_pk_bg.imageset/ms_room_game_underwa_pk_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/Contents.json
index cde124b0..207a0750 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_bg_first@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/ms_room_game_victory_bg_first@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/ms_room_game_victory_bg_first@2x.png
deleted file mode 100644
index 51550ee5..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_first.imageset/ms_room_game_victory_bg_first@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/Contents.json
index 3029c8d6..0c19a61e 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_bg_second@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/ms_room_game_victory_bg_second@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/ms_room_game_victory_bg_second@2x.png
deleted file mode 100644
index 5cad5306..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_bg_second.imageset/ms_room_game_victory_bg_second@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/Contents.json
index d17546b7..aa4bf198 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/Contents.json	
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/Contents.json	
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_border_first@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/ms_room_game_victory_border_first@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/ms_room_game_victory_border_first@2x.png
deleted file mode 100644
index 2de814ea..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/ms_room_game_victory_border_first@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/Contents.json
index d17546b7..aa4bf198 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_border_first@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/ms_room_game_victory_border_first@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/ms_room_game_victory_border_first@2x.png
deleted file mode 100644
index 2de814ea..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first.imageset/ms_room_game_victory_border_first@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/Contents.json
index 34cbe399..60ce99ee 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_border_second@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/ms_room_game_victory_border_second@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/ms_room_game_victory_border_second@2x.png
deleted file mode 100644
index f227eeca..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_second.imageset/ms_room_game_victory_border_second@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/Contents.json
index 2f7e97d6..1c740054 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_close_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/ms_room_game_victory_close_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/ms_room_game_victory_close_bg@2x.png
deleted file mode 100644
index b32781a3..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_close_bg.imageset/ms_room_game_victory_close_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/Contents.json
index 1624632b..1705ce1e 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_coin_bg_first@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/ms_room_game_victory_coin_bg_first@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/ms_room_game_victory_coin_bg_first@2x.png
deleted file mode 100644
index 5448cc36..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_first.imageset/ms_room_game_victory_coin_bg_first@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/Contents.json
index 95a78812..f233dfe2 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_coin_bg_second@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/ms_room_game_victory_coin_bg_second@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/ms_room_game_victory_coin_bg_second@2x.png
deleted file mode 100644
index 5bd8fb05..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_coin_bg_second.imageset/ms_room_game_victory_coin_bg_second@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/Contents.json
index fb4cdeb9..2812b2cf 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_rank_first@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/ms_room_game_victory_rank_first@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/ms_room_game_victory_rank_first@2x.png
deleted file mode 100644
index a58945a3..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_first.imageset/ms_room_game_victory_rank_first@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/Contents.json
index 6ee5a4c3..dc1f484f 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_rank_second@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/ms_room_game_victory_rank_second@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/ms_room_game_victory_rank_second@2x.png
deleted file mode 100644
index e540207f..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_rank_second.imageset/ms_room_game_victory_rank_second@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/Contents.json
index 6627ba64..c76e671d 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_restart_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/ms_room_game_victory_restart_bg@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/ms_room_game_victory_restart_bg@2x.png
deleted file mode 100644
index bcc9cb54..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_restart_bg.imageset/ms_room_game_victory_restart_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/Contents.json
index 89544768..f3ac3a14 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_top_fail_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/ms_room_game_victory_top_fail_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/ms_room_game_victory_top_fail_icon@2x.png
deleted file mode 100644
index 897480ba..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_fail_icon.imageset/ms_room_game_victory_top_fail_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/Contents.json
index f8429187..abb98225 100644
--- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_top_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/ms_room_game_victory_top_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/ms_room_game_victory_top_icon@2x.png
deleted file mode 100644
index bdda8500..00000000
Binary files a/YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_top_icon.imageset/ms_room_game_victory_top_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/示例图@3x (1).png b/YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/示例图@3x (1).png
deleted file mode 100644
index 1eff2d46..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_10.imageset/示例图@3x (1).png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/示例图@3x.png b/YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/示例图@3x.png
deleted file mode 100644
index 53ba41fa..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_15.imageset/示例图@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/示例图@3x 2.png b/YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/示例图@3x 2.png
deleted file mode 100644
index 6402aa9a..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_9.imageset/示例图@3x 2.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/Contents.json b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/Contents.json
deleted file mode 100644
index ead3b654..00000000
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "示例图@2x(1).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "示例图@3x(1).png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@2x(1).png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@2x(1).png
deleted file mode 100644
index 999fd8cd..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@2x(1).png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@3x(1).png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@3x(1).png
deleted file mode 100644
index 24525e09..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_10.imageset/示例图@3x(1).png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/Contents.json b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/Contents.json
deleted file mode 100644
index 262cf926..00000000
--- a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "示例图@2x(2).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "示例图@3x(2).png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@2x(2).png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@2x(2).png
deleted file mode 100644
index 880210b5..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@2x(2).png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@3x(2).png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@3x(2).png
deleted file mode 100644
index f14bee1d..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_15.imageset/示例图@3x(2).png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@2x.png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@2x.png
deleted file mode 100644
index 9137058f..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@3x.png b/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@3x.png
deleted file mode 100644
index ae003db2..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_example_mini_9.imageset/示例图@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/Contents.json b/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/Contents.json
deleted file mode 100644
index e0ce83f4..00000000
--- a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_type_selection_frame@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_type_selection_frame@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@2x.png b/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@2x.png
deleted file mode 100644
index 26fa7a17..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@3x.png b/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@3x.png
deleted file mode 100644
index 72ad1fbe..00000000
Binary files a/YuMi/Assets.xcassets/RoomType/room_type_selection_frame.imageset/room_type_selection_frame@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/Contents.json
index 05da95ad..b5106cdd 100644
--- a/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_new_user_greet_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/room_new_user_greet_bg@2x.png b/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/room_new_user_greet_bg@2x.png
deleted file mode 100644
index 92b80312..00000000
Binary files a/YuMi/Assets.xcassets/low/Greet/room_new_user_greet_bg.imageset/room_new_user_greet_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/Contents.json
deleted file mode 100644
index 8b2481aa..00000000
--- a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_live_hot_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_live_hot_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@2x.png b/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@2x.png
deleted file mode 100644
index c85ef73d..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@3x.png b/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@3x.png
deleted file mode 100644
index c12712a7..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_hot_bg.imageset/home_live_hot_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/Contents.json b/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/Contents.json
index 9c7d1bcb..01008d49 100644
--- a/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_live_recommend_tag@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/home_live_recommend_tag@2x.png b/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/home_live_recommend_tag@2x.png
deleted file mode 100644
index f1cc49ec..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_recommend_tag.imageset/home_live_recommend_tag@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/Contents.json
deleted file mode 100644
index f8a2625e..00000000
--- a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_live_record_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_live_record_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@2x.png b/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@2x.png
deleted file mode 100644
index 44642311..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@3x.png b/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@3x.png
deleted file mode 100644
index a405dcb7..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_record_bg.imageset/home_live_record_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/Contents.json
index 42b2f87b..836ebb7d 100644
--- a/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_live_record_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/home_live_record_icon@2x.png b/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/home_live_record_icon@2x.png
deleted file mode 100644
index f6be9088..00000000
Binary files a/YuMi/Assets.xcassets/low/Live/home_live_record_icon.imageset/home_live_record_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_bg.imageset/Contents.json
index 9cde55d4..59d893aa 100644
--- a/YuMi/Assets.xcassets/low/home_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_bg.imageset/Contents.json
@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "home_bg@2x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/Contents.json
deleted file mode 100644
index 51564db4..00000000
--- a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_hot_section_logo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_hot_section_logo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@2x.png b/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@2x.png
deleted file mode 100644
index 2f35c5d3..00000000
Binary files a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@3x.png b/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@3x.png
deleted file mode 100644
index 54a5652a..00000000
Binary files a/YuMi/Assets.xcassets/low/home_hot_section_logo.imageset/home_hot_section_logo@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/Contents.json
index 246c8b4d..6bf561dd 100644
--- a/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_like_across_pk_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/home_like_across_pk_bg@2x.png b/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/home_like_across_pk_bg@2x.png
deleted file mode 100644
index 46d3fb83..00000000
Binary files a/YuMi/Assets.xcassets/low/home_like_across_pk_bg.imageset/home_like_across_pk_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_nav_background.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_nav_background.imageset/Contents.json
index 5076084d..2dca7a1e 100644
--- a/YuMi/Assets.xcassets/low/home_nav_background.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_nav_background.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_nav_background@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_nav_background.imageset/home_nav_background@2x.png b/YuMi/Assets.xcassets/low/home_nav_background.imageset/home_nav_background@2x.png
deleted file mode 100644
index ca119d0b..00000000
Binary files a/YuMi/Assets.xcassets/low/home_nav_background.imageset/home_nav_background@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/Contents.json
deleted file mode 100644
index d5fcb900..00000000
--- a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_party_little_game_content_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_party_little_game_content_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@2x.png b/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@2x.png
deleted file mode 100644
index f5872756..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@3x.png b/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@3x.png
deleted file mode 100644
index cb31952a..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_content_bg.imageset/home_party_little_game_content_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/Contents.json
deleted file mode 100644
index fd19ff69..00000000
--- a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_party_little_game_cover@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_party_little_game_cover@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@2x.png b/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@2x.png
deleted file mode 100644
index 2293a9e3..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@3x.png b/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@3x.png
deleted file mode 100644
index 28bc211f..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_cover.imageset/home_party_little_game_cover@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/Contents.json
deleted file mode 100644
index 3d84827e..00000000
--- a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_party_little_game_enter@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_party_little_game_enter@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@2x.png b/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@2x.png
deleted file mode 100644
index 6d9088f2..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@3x.png b/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@3x.png
deleted file mode 100644
index 3e4ae234..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_enter.imageset/home_party_little_game_enter@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/Contents.json
deleted file mode 100644
index cb177b5f..00000000
--- a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_party_little_game_match@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_party_little_game_match@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@2x.png b/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@2x.png
deleted file mode 100644
index 8fcae567..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@3x.png b/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@3x.png
deleted file mode 100644
index 9ac929f2..00000000
Binary files a/YuMi/Assets.xcassets/low/home_party_little_game_match.imageset/home_party_little_game_match@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/Contents.json
deleted file mode 100644
index df7982d5..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_across_pk_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_across_pk_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@2x.png b/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@2x.png
deleted file mode 100644
index e32d203f..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@3x.png b/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@3x.png
deleted file mode 100644
index e6ca0ffd..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_across_pk_bg.imageset/home_recommend_across_pk_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/Contents.json
deleted file mode 100644
index 55f19863..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_hot_note@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_hot_note@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@2x.png b/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@2x.png
deleted file mode 100644
index 1dbbbddb..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@3x.png b/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@3x.png
deleted file mode 100644
index 1ce963ba..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_hot_note.imageset/home_recommend_hot_note@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/Contents.json
deleted file mode 100644
index 59bc8a58..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_indicator_room@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_indicator_room@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@2x.png b/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@2x.png
deleted file mode 100644
index c1ae5e2c..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@3x.png b/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@3x.png
deleted file mode 100644
index a01f8859..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_indicator_room.imageset/home_recommend_indicator_room@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/Contents.json
index 88ffecb7..9f301c47 100644
--- a/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_recommend_nick_shadow_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/home_recommend_nick_shadow_bg@2x.png b/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/home_recommend_nick_shadow_bg@2x.png
deleted file mode 100644
index 3abad2c9..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_nick_shadow_bg.imageset/home_recommend_nick_shadow_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/Contents.json
deleted file mode 100644
index 98a1e0da..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_play_list_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_play_list_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@2x.png b/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@2x.png
deleted file mode 100644
index 58b806ad..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@3x.png b/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@3x.png
deleted file mode 100644
index baa09584..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_play_list_bg.imageset/home_recommend_play_list_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/Contents.json
deleted file mode 100644
index 1a8586be..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_play_person_logo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_play_person_logo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@2x.png b/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@2x.png
deleted file mode 100644
index 5c5bb891..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@3x.png b/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@3x.png
deleted file mode 100644
index adaf698e..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_play_person_logo.imageset/home_recommend_play_person_logo@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/Contents.json
deleted file mode 100644
index 9d62e5ef..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_room_more@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_room_more@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@2x.png b/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@2x.png
deleted file mode 100644
index 4248ed49..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@3x.png b/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@3x.png
deleted file mode 100644
index 9048ed2e..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_room_more.imageset/home_recommend_room_more@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/Contents.json
deleted file mode 100644
index 62c4f8c8..00000000
--- a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_recommend_section_logo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_recommend_section_logo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@2x.png b/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@2x.png
deleted file mode 100644
index 0e4c4f11..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@3x.png b/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@3x.png
deleted file mode 100644
index 11695d0e..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_section_logo.imageset/home_recommend_section_logo@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/Contents.json
index 68445490..f18b0be8 100644
--- a/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_recommend_tag_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/home_recommend_tag_bg@2x.png b/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/home_recommend_tag_bg@2x.png
deleted file mode 100644
index c95cf9fc..00000000
Binary files a/YuMi/Assets.xcassets/low/home_recommend_tag_bg.imageset/home_recommend_tag_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/Contents.json
deleted file mode 100644
index e9ce05aa..00000000
--- a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_room_list_note_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_room_list_note_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@2x.png b/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@2x.png
deleted file mode 100644
index 868c0007..00000000
Binary files a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@3x.png b/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@3x.png
deleted file mode 100644
index 24f6a9ae..00000000
Binary files a/YuMi/Assets.xcassets/low/home_room_list_note_bg.imageset/home_room_list_note_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/Contents.json
deleted file mode 100644
index df2bad3a..00000000
--- a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_room_list_shadow_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_room_list_shadow_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@2x.png b/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@2x.png
deleted file mode 100644
index a797ae0c..00000000
Binary files a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@3x.png b/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@3x.png
deleted file mode 100644
index 800a2885..00000000
Binary files a/YuMi/Assets.xcassets/low/home_room_list_shadow_bg.imageset/home_room_list_shadow_bg@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_search_input_search.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_search_input_search.imageset/Contents.json
index 11ea90b2..4c96fc6f 100644
--- a/YuMi/Assets.xcassets/low/home_search_input_search.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_search_input_search.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_search_input_search@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_search_input_search.imageset/home_search_input_search@2x.png b/YuMi/Assets.xcassets/low/home_search_input_search.imageset/home_search_input_search@2x.png
deleted file mode 100644
index 6c637ab7..00000000
Binary files a/YuMi/Assets.xcassets/low/home_search_input_search.imageset/home_search_input_search@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_search_user_online.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_search_user_online.imageset/Contents.json
index 69fc3809..9f512b00 100644
--- a/YuMi/Assets.xcassets/low/home_search_user_online.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_search_user_online.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_search_user_online@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_search_user_online.imageset/home_search_user_online@2x.png b/YuMi/Assets.xcassets/low/home_search_user_online.imageset/home_search_user_online@2x.png
deleted file mode 100644
index 099261ce..00000000
Binary files a/YuMi/Assets.xcassets/low/home_search_user_online.imageset/home_search_user_online@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/home_search_white_back.imageset/Contents.json b/YuMi/Assets.xcassets/low/home_search_white_back.imageset/Contents.json
index 955ef7b3..c50a0792 100644
--- a/YuMi/Assets.xcassets/low/home_search_white_back.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/home_search_white_back.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_search_white_back@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/home_search_white_back.imageset/home_search_white_back@2x.png b/YuMi/Assets.xcassets/low/home_search_white_back.imageset/home_search_white_back@2x.png
deleted file mode 100644
index 313a154f..00000000
Binary files a/YuMi/Assets.xcassets/low/home_search_white_back.imageset/home_search_white_back@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/Contents.json b/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/Contents.json
deleted file mode 100644
index 09ec21bc..00000000
--- a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "home_nav_indicator@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "home_nav_indicator@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@2x.png
deleted file mode 100644
index dbfeca98..00000000
Binary files a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@3x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@3x.png
deleted file mode 100644
index 48a19dd8..00000000
Binary files a/YuMi/Assets.xcassets/low/navigation/home_nav_indicator.imageset/home_nav_indicator@3x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/Contents.json b/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/Contents.json
index 415060f6..4e44c08b 100644
--- a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_nav_open_room@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@2x.png
deleted file mode 100644
index f00f9fb0..00000000
Binary files a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/Contents.json b/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/Contents.json
index 111471cb..02eb1827 100644
--- a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_nav_rank@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@2x.png
deleted file mode 100644
index f6e54275..00000000
Binary files a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/Contents.json
index c4d87a17..ad0317ad 100644
--- a/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "_home_game_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/_home_game_bg@2x.png b/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/_home_game_bg@2x.png
deleted file mode 100644
index efc40f40..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/_home_game_bg.imageset/_home_game_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/Contents.json
index c173ae97..a0b01b36 100644
--- a/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "_home_game_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/_home_game_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/_home_game_icon@2x.png
deleted file mode 100644
index 713a6536..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/_home_game_icon.imageset/_home_game_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/Contents.json
index 6cca8b22..0c8fca62 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_age_boy_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/home_age_boy_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/home_age_boy_icon@2x.png
deleted file mode 100644
index d83d1311..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_age_boy_icon.imageset/home_age_boy_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/Contents.json
index 2bb0b565..1eac9eac 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_age_girl_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/home_age_girl_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/home_age_girl_icon@2x.png
deleted file mode 100644
index 8dce996a..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_age_girl_icon.imageset/home_age_girl_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/Contents.json
index 97adfe9c..48ec3a24 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_audio_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/home_audio_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/home_audio_icon@2x.png
deleted file mode 100644
index d804ed18..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_audio_icon.imageset/home_audio_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/Contents.json
index 5a19127b..b249f01b 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_audio_play_play@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/home_audio_play_play@2x.png b/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/home_audio_play_play@2x.png
deleted file mode 100644
index 92b29f94..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_audio_play_play.imageset/home_audio_play_play@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/Contents.json
index 14a14d64..82e62894 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_audio_stop@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/home_audio_stop@2x.png b/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/home_audio_stop@2x.png
deleted file mode 100644
index 22d7159f..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_audio_stop.imageset/home_audio_stop@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/Contents.json
index 220522eb..e160efe5 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_game_back@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/home_game_back@2x.png b/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/home_game_back@2x.png
deleted file mode 100644
index ea1e53c0..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_game_back.imageset/home_game_back@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/Contents.json
index 37f3285c..569a4bc2 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_palying_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/home_palying_bg@2x.png b/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/home_palying_bg@2x.png
deleted file mode 100644
index 8a70916a..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_palying_bg.imageset/home_palying_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/Contents.json
index eae49d6c..a85b6d0c 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_palying_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/home_palying_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/home_palying_icon@2x.png
deleted file mode 100644
index ab2c97c3..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_palying_icon.imageset/home_palying_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/Contents.json
index b003bd44..b3a29e52 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_party_number@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/home_party_number@2x.png b/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/home_party_number@2x.png
deleted file mode 100644
index 49f2144a..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_party_number.imageset/home_party_number@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/Contents.json
index 922fc539..9477a854 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_play_create_room@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/home_play_create_room@2x.png b/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/home_play_create_room@2x.png
deleted file mode 100644
index 37599414..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_play_create_room.imageset/home_play_create_room@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/Contents.json
index 360b33b0..54a66e9e 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_play_game@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/home_play_game@2x.png b/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/home_play_game@2x.png
deleted file mode 100644
index 5f42e395..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_play_game.imageset/home_play_game@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/Contents.json
index 62640e9a..2272d75e 100644
--- a/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "home_slider_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/home_slider_bg@2x.png b/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/home_slider_bg@2x.png
deleted file mode 100644
index 0584d673..00000000
Binary files a/YuMi/Assets.xcassets/low/newhome/home_slider_bg.imageset/home_slider_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/Contents.json b/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/Contents.json
index c15e7efd..f3a4d92f 100644
--- a/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_like_collect_room_hot@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/room_like_collect_room_hot@2x.png b/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/room_like_collect_room_hot@2x.png
deleted file mode 100644
index ef5ff695..00000000
Binary files a/YuMi/Assets.xcassets/low/room_like_collect_room_hot.imageset/room_like_collect_room_hot@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json
index dda6e816..8a02152e 100644
--- a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "组 2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png
deleted file mode 100644
index e72e2ac9..00000000
Binary files a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/Contents.json b/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/Contents.json
index ddb69cd5..cf8884e0 100644
--- a/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_lucky_broadcast_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/gift_lucky_broadcast_bg@2x.png b/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/gift_lucky_broadcast_bg@2x.png
deleted file mode 100644
index 0bdbf946..00000000
Binary files a/YuMi/Assets.xcassets/middle/GiftLuckTab/gift_lucky_broadcast_bg.imageset/gift_lucky_broadcast_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/Contents.json
index 4fa391f6..a7d34e19 100644
--- a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_twelve_star_Banner_arrow@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/gift_twelve_star_Banner_arrow@2x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/gift_twelve_star_Banner_arrow@2x.png
deleted file mode 100644
index ebf2a116..00000000
Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_arrow.imageset/gift_twelve_star_Banner_arrow@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/Contents.json b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/Contents.json
index e7d223a2..a6905ce5 100644
--- a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_twelve_star_Banner_naming_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/gift_twelve_star_Banner_naming_bg@2x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/gift_twelve_star_Banner_naming_bg@2x.png
deleted file mode 100644
index 728dce66..00000000
Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_naming_bg.imageset/gift_twelve_star_Banner_naming_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/Contents.json b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/Contents.json
index c01aa5df..3f7837c6 100644
--- a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_twelve_star_Banner_rich_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/gift_twelve_star_Banner_rich_bg@2x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/gift_twelve_star_Banner_rich_bg@2x.png
deleted file mode 100644
index 3347c73f..00000000
Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_twelve_star_Banner_rich_bg.imageset/gift_twelve_star_Banner_rich_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/Contents.json b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/Contents.json
index e417b94d..74d6c971 100644
--- a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_weekStar_background@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/gift_weekStar_background@2x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/gift_weekStar_background@2x.png
deleted file mode 100644
index 9a33a3ee..00000000
Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_background.imageset/gift_weekStar_background@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/Contents.json b/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/Contents.json
index c9a1d14c..20ed7ba9 100644
--- a/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gift_type_newIcon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/gift_type_newIcon@2x.png b/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/gift_type_newIcon@2x.png
deleted file mode 100644
index c6d3bf4f..00000000
Binary files a/YuMi/Assets.xcassets/middle/gift_type_newIcon.imageset/gift_type_newIcon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json b/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json
index 9827d6a0..c8f15520 100644
--- a/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "pi_gift_diamond_add@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/pi_gift_diamond_add@2x.png b/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/pi_gift_diamond_add@2x.png
deleted file mode 100644
index 2bde970e..00000000
Binary files a/YuMi/Assets.xcassets/middle/pi_gift_diamond_add.imageset/pi_gift_diamond_add@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/Contents.json b/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/Contents.json
index c885b53b..f48f7cfd 100644
--- a/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_graffiti_close@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/room_gift_graffiti_close@2x.png b/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/room_gift_graffiti_close@2x.png
deleted file mode 100644
index 19e86c51..00000000
Binary files a/YuMi/Assets.xcassets/middle/room_gift_graffiti_close.imageset/room_gift_graffiti_close@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/Contents.json b/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/Contents.json
index ea61a618..5ad23234 100644
--- a/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_graffiti_delete@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/room_gift_graffiti_delete@2x.png b/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/room_gift_graffiti_delete@2x.png
deleted file mode 100644
index de3a4dc1..00000000
Binary files a/YuMi/Assets.xcassets/middle/room_gift_graffiti_delete.imageset/room_gift_graffiti_delete@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/Contents.json b/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/Contents.json
index bc993863..406488bc 100644
--- a/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_graffiti_hand@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/room_gift_graffiti_hand@2x.png b/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/room_gift_graffiti_hand@2x.png
deleted file mode 100644
index 8424c6d4..00000000
Binary files a/YuMi/Assets.xcassets/middle/room_gift_graffiti_hand.imageset/room_gift_graffiti_hand@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/Contents.json b/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/Contents.json
index d3a7287c..1a3ef2a2 100644
--- a/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_graffiti_repeal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/room_gift_graffiti_repeal@2x.png b/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/room_gift_graffiti_repeal@2x.png
deleted file mode 100644
index 8e23ae15..00000000
Binary files a/YuMi/Assets.xcassets/middle/room_gift_graffiti_repeal.imageset/room_gift_graffiti_repeal@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json b/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json
index d78fcce4..51d07367 100644
--- a/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_gift_super_gift_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/room_gift_super_gift_icon@2x.png b/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/room_gift_super_gift_icon@2x.png
deleted file mode 100644
index c48c9285..00000000
Binary files a/YuMi/Assets.xcassets/middle/room_gift_super_gift_icon.imageset/room_gift_super_gift_icon@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/Contents.json b/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/Contents.json
index 44ed6269..e62ab3dc 100644
--- a/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "version_update_top_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/version_update_top_bg@2x.png b/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/version_update_top_bg@2x.png
deleted file mode 100644
index f2afd617..00000000
Binary files a/YuMi/Assets.xcassets/poersioon/version_update_top_bg.imageset/version_update_top_bg@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/Contents.json b/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/Contents.json
index 3f8cbbd3..b0fd507d 100644
--- a/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "share_friend@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/share_friend@2x.png b/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/share_friend@2x.png
deleted file mode 100644
index 3a6f654e..00000000
Binary files a/YuMi/Assets.xcassets/utils/Share/share_friend.imageset/share_friend@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/Contents.json b/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/Contents.json
index 2659d872..2c5b07e3 100644
--- a/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "share_qq_disable@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/share_qq_disable@2x.png b/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/share_qq_disable@2x.png
deleted file mode 100644
index cdc3a461..00000000
Binary files a/YuMi/Assets.xcassets/utils/Share/share_qq_disable.imageset/share_qq_disable@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/Contents.json b/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/Contents.json
index fb035cb1..3e9a439a 100644
--- a/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "share_qqzone_disable@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/share_qqzone_disable@2x.png b/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/share_qqzone_disable@2x.png
deleted file mode 100644
index 59b69a79..00000000
Binary files a/YuMi/Assets.xcassets/utils/Share/share_qqzone_disable.imageset/share_qqzone_disable@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json
index c0a7a611..b5bc6d9f 100644
--- a/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json
@@ -1,7 +1,6 @@
 {
   "images" : [
     {
-      "filename" : "common_banner.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -10,6 +9,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "common_banner.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/Contents.json
index 4ece2b53..7eef6722 100644
--- a/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_checkbox_checked@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/common_checkbox_checked@2x.png b/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/common_checkbox_checked@2x.png
deleted file mode 100644
index e8700513..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_checkbox_checked.imageset/common_checkbox_checked@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/Contents.json
index a80db0e3..047e5c0f 100644
--- a/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_checkbox_uncheck@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/common_checkbox_uncheck@2x.png b/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/common_checkbox_uncheck@2x.png
deleted file mode 100644
index 22beeddb..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_checkbox_uncheck.imageset/common_checkbox_uncheck@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_close_white.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_close_white.imageset/Contents.json
index 1786b6d7..6f433881 100644
--- a/YuMi/Assets.xcassets/utils/common_close_white.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_close_white.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_close_white@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_close_white.imageset/common_close_white@2x.png b/YuMi/Assets.xcassets/utils/common_close_white.imageset/common_close_white@2x.png
deleted file mode 100644
index db170c1e..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_close_white.imageset/common_close_white@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_diamond.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_diamond.imageset/Contents.json
index 60294607..0ba0e854 100644
--- a/YuMi/Assets.xcassets/utils/common_diamond.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_diamond.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_diamond@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_diamond.imageset/common_diamond@2x.png b/YuMi/Assets.xcassets/utils/common_diamond.imageset/common_diamond@2x.png
deleted file mode 100644
index 5d290e29..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_diamond.imageset/common_diamond@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/Contents.json
index 315d0366..52a9b1c3 100644
--- a/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_down_arrow@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/common_down_arrow@2x.png b/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/common_down_arrow@2x.png
deleted file mode 100644
index 146f6a6b..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_down_arrow.imageset/common_down_arrow@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_empty.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_empty.imageset/Contents.json
index 77117db8..ce4a96f8 100644
--- a/YuMi/Assets.xcassets/utils/common_empty.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_empty.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_empty@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_empty.imageset/common_empty@2x.png b/YuMi/Assets.xcassets/utils/common_empty.imageset/common_empty@2x.png
deleted file mode 100644
index 5d531532..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_empty.imageset/common_empty@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/Contents.json
index 0b09636e..384616ec 100644
--- a/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_empty_UFO@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/common_empty_UFO@2x.png b/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/common_empty_UFO@2x.png
deleted file mode 100644
index c9bd620f..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_empty_UFO.imageset/common_empty_UFO@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_female.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_female.imageset/Contents.json
index 9c8be61e..bc1c818e 100644
--- a/YuMi/Assets.xcassets/utils/common_female.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_female.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_female@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_female.imageset/common_female@2x.png b/YuMi/Assets.xcassets/utils/common_female.imageset/common_female@2x.png
deleted file mode 100644
index 3ff69fda..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_female.imageset/common_female@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_male.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_male.imageset/Contents.json
index 4be67a95..ab99fcb0 100644
--- a/YuMi/Assets.xcassets/utils/common_male.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_male.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_male@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_male.imageset/common_male@2x.png b/YuMi/Assets.xcassets/utils/common_male.imageset/common_male@2x.png
deleted file mode 100644
index e0ffcb98..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_male.imageset/common_male@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_nav_back.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_nav_back.imageset/Contents.json
index 608ee4a1..2051ee36 100644
--- a/YuMi/Assets.xcassets/utils/common_nav_back.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_nav_back.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_nav_back@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_nav_back.imageset/common_nav_back@2x.png b/YuMi/Assets.xcassets/utils/common_nav_back.imageset/common_nav_back@2x.png
deleted file mode 100644
index 8fa6c4ae..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_nav_back.imageset/common_nav_back@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/Contents.json
index 7458e93a..6765617c 100644
--- a/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_nav_back_white@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/common_nav_back_white@2x.png b/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/common_nav_back_white@2x.png
deleted file mode 100644
index 17669a49..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_nav_back_white.imageset/common_nav_back_white@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_offical.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_offical.imageset/Contents.json
index b724b1bc..2dd2d8a0 100644
--- a/YuMi/Assets.xcassets/utils/common_offical.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_offical.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_offical@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_offical.imageset/common_offical@2x.png b/YuMi/Assets.xcassets/utils/common_offical.imageset/common_offical@2x.png
deleted file mode 100644
index f90fba32..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_offical.imageset/common_offical@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/common_super_admin.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_super_admin.imageset/Contents.json
index 7e5dcb73..06441d71 100644
--- a/YuMi/Assets.xcassets/utils/common_super_admin.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/common_super_admin.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_super_admin@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/common_super_admin.imageset/common_super_admin@2x.png b/YuMi/Assets.xcassets/utils/common_super_admin.imageset/common_super_admin@2x.png
deleted file mode 100644
index a892435c..00000000
Binary files a/YuMi/Assets.xcassets/utils/common_super_admin.imageset/common_super_admin@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/Contents.json b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/Contents.json
index c63361a3..33e88c9f 100644
--- a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_info_id_mark@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/user_info_id_mark@2x.png b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/user_info_id_mark@2x.png
deleted file mode 100644
index b8870c56..00000000
Binary files a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark.imageset/user_info_id_mark@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/Contents.json b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/Contents.json
index 640c2833..f8173680 100644
--- a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_info_id_beatiful_mark_short@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/user_info_id_beatiful_mark_short@2x.png b/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/user_info_id_beatiful_mark_short@2x.png
deleted file mode 100644
index 8d440263..00000000
Binary files a/YuMi/Assets.xcassets/utils/user_info_id_beatiful_mark_short.imageset/user_info_id_beatiful_mark_short@2x.png and /dev/null differ
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/Contents.json b/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/Contents.json
index c63361a3..33e88c9f 100644
--- a/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/Contents.json
@@ -5,7 +5,6 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_info_id_mark@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/user_info_id_mark@2x.png b/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/user_info_id_mark@2x.png
deleted file mode 100644
index 9b3ceed3..00000000
Binary files a/YuMi/Assets.xcassets/utils/user_info_id_mark.imageset/user_info_id_mark@2x.png and /dev/null differ
diff --git a/YuMi/Modules/YMMine/View/Recharge/IAPManager.m b/YuMi/Modules/YMMine/View/Recharge/IAPManager.m
index 567356f0..c8e976a0 100644
--- a/YuMi/Modules/YMMine/View/Recharge/IAPManager.m
+++ b/YuMi/Modules/YMMine/View/Recharge/IAPManager.m
@@ -57,6 +57,17 @@
     }
 }
 
+- (NSString *)fetchEncodedReceipt {
+    NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
+    NSData *receiptData = [NSData dataWithContentsOfURL:receiptURL];
+    if (!receiptData) return nil;
+    return [receiptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
+}
+
+- (BOOL)isValidTransactionID:(NSString *)tID orderID:(NSString *)orderID {
+    return (tID.length > 0 && orderID.length > 0);
+}
+
 // 开始正常内购流程
 - (void)purchase:(NSString *)productId
          success:(void(^)(NSString *transactionID, NSString *orderID))success
@@ -300,10 +311,7 @@
 
 // 内购付款成功后保存收据 id 到钥匙串
 - (void)saveTransactionID {
-    NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
-    NSData *receiptData = [NSData dataWithContentsOfURL:receiptURL];
-    NSString *encodedReceipt = [receiptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
-
+    NSString *encodedReceipt = [self fetchEncodedReceipt];
     // 初始化字典并逐步填充
     NSMutableDictionary *receiptInfo = [NSMutableDictionary dictionary];
 
@@ -362,7 +370,7 @@
     
     NSLog(@" ------------.------------ 尝试后端验单：%@ | %@", tID, orderID);
     
-    if (tID.length == 0 || orderID.length == 0) {
+    if (![self isValidTransactionID:tID orderID:orderID]) {
         // 本地数据异常，不重试
         [self handleCheckReceiptSuccess:tID isFromRecheck:YES];
         next(NO);
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m
index 7a6c29c0..722120cb 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m
@@ -70,7 +70,13 @@
     }
     
     GiftReceiveInfoModel *giftInfo = self.giftQueue.firstObject;
-    [self distributeGiftAnimation:giftInfo];
+
+    @kWeakify(self);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        @kStrongify(self);
+        [self distributeGiftAnimation:giftInfo];
+    });
+    
     if (self.giftQueue.count > 0) {
         [self.giftQueue removeObjectAtIndex:0];
     }
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
index 94c3c6ac..c9a43a10 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
@@ -186,6 +186,10 @@ GiftAnimationDelegate>
 @implementation XPRoomAnimationView
 
 - (void)dealloc {
+    if (self.giftEffectTimer) {
+        dispatch_source_cancel(self.giftEffectTimer);
+        self.giftEffectTimer = nil;
+    }
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
     [[NIMSDK sharedSDK].broadcastManager removeDelegate:self];
     
@@ -195,13 +199,9 @@ GiftAnimationDelegate>
         dispatch_source_cancel(self.giftEffectTimer);
         self.giftEffectTimer = nil;
     }
-    
-//    if(self.giftTimer != nil){
-//        dispatch_source_cancel(self.giftTimer);
-//        self.giftTimer = nil;
-//    }
     [self.giftPagView removeListener:self];
 }
+
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
     self = [super init];
     if (self) {
diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h
new file mode 100644
index 00000000..a313ac96
--- /dev/null
+++ b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h
@@ -0,0 +1,16 @@
+//
+//  LuckyPackageViewController.h
+//  YuMi
+//
+//  Created by P on 2025/1/10.
+//
+
+#import "MvpViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface LuckyPackageViewController : MvpViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m
new file mode 100644
index 00000000..775d529e
--- /dev/null
+++ b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m
@@ -0,0 +1,31 @@
+//
+//  LuckyPackageViewController.m
+//  YuMi
+//
+//  Created by P on 2025/1/10.
+//
+
+#import "LuckyPackageViewController.h"
+
+@interface LuckyPackageViewController ()
+
+@end
+
+@implementation LuckyPackageViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.h b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h
similarity index 100%
rename from YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.h
rename to YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h
diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.m b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m
similarity index 97%
rename from YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.m
rename to YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m
index 199adaa6..a3cf24e5 100644
--- a/YuMi/Modules/YMRoom/View/ActivityContainerView/RoomSideMenu.m
+++ b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m
@@ -38,6 +38,11 @@
 
 UIKIT_EXTERN NSString *kShowFirstRechargeView;
 
+static CGFloat const kMenuItemSpacing = 4.0f;
+static CGFloat const kMenuItemInset = 15.0f;
+static CGFloat const kExpandedHeight = 260.0f;
+static CGFloat const kNormalHeight = 160.0f;
+
 @interface RoomSideMenu ()<SDCycleScrollViewDelegate, PIRoomEnterRedPacketViewDelegate>
 
 @property(nonatomic, strong) NSMutableArray *menuItemViews;
@@ -185,7 +190,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
 
 - (void)updateForBoomDetailArray:(NSArray <BoomDetailModel*>  *)models {
     _boomModels = models;
-    if (!models || models.count == 0) {
+    if (!models || ![models isKindOfClass:[NSArray class]] || models.count == 0) {
         return;
     }
 
@@ -213,8 +218,12 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         return;
     }
     
-    CGFloat inset = 15;
-    CGFloat spacing = 4;
+    [self.scrollView.layer setNeedsLayout];
+    [CATransaction begin];
+    [CATransaction setDisableActions:YES];
+    
+    CGFloat inset = kMenuItemInset;
+    CGFloat spacing = kMenuItemSpacing;
     CGSize size = CGSizeMake(self.scrollView.bounds.size.width-30, self.scrollView.bounds.size.width-30);
     
 //    NSLog(@"--------------- blkaa 1 blkaa: %@", [NSValue valueWithCGRect:self.scrollView.frame]);
@@ -232,7 +241,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         }];
     }
     
-    [self layoutIfNeeded];
+//    [self layoutIfNeeded];
     
 //    NSLog(@"--------------- blkaa 2 blkaa: %@", [NSValue valueWithCGRect:self.scrollView.frame]);
     
@@ -255,6 +264,8 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
             [self.scrollView setContentOffset:CGPointMake(0, bottomOffset) animated:YES];
         }
     });
+    
+    [CATransaction commit];
 }
 
 - (void)configLittleGameActivity {
@@ -524,13 +535,13 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     if (self.isExpand) {
         [self.expandButton setImage:kImage(@"side_menu_close") forState:UIControlStateNormal];
         [self mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.height.mas_equalTo(kGetScaleWidth(260));
+            make.height.mas_equalTo(kGetScaleWidth(kExpandedHeight));
         }];
         
     } else {
         [self.expandButton setImage:kImage(@"side_menu_open") forState:UIControlStateNormal];
         [self mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.height.mas_equalTo(kGetScaleWidth(160));
+            make.height.mas_equalTo(kGetScaleWidth(kNormalHeight));
         }];
     }
     [self layoutIfNeeded];
@@ -827,7 +838,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
         UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom];
         [b setBackgroundImage:[UIImage imageNamed:@"room_pk_panel_mini_icon"] forState:UIControlStateNormal];
         [b addTarget:self action:@selector(didTapPKMenuButton) forControlEvents:UIControlEventTouchUpInside];
-        b.imageEdgeInsets = UIEdgeInsetsMake(4, 4, 4, 4);
+        b.imageEdgeInsets = UIEdgeInsetsMake(kMenuItemSpacing, kMenuItemSpacing, kMenuItemSpacing, kMenuItemSpacing);
         b.tag = 105;
         _pkMenuButton = b;
     }
diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h
index ccbefebe..1b671233 100644
--- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h
+++ b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 ///抱她上麦的 数据
 /// @param micCount 当前麦序的个数
-- (void)getRoomMicroItems:(int)micCount cardInfo:(XPUserCardInfoModel *)cardInfo;
+- (void)getRoomMicroItems:(NSInteger)micCount cardInfo:(XPUserCardInfoModel *)cardInfo;
 
 /// 关注用户 /取消该关注
 /// @param targetUid 目标用户的uid
diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m
index 35c2f5cd..b4e96e2f 100644
--- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m
+++ b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m
@@ -168,7 +168,7 @@
 
 ///抱她上麦的 数据
 /// @param micCount 当前麦序的个数
-- (void)getRoomMicroItems:(int)micCount cardInfo:(XPUserCardInfoModel *)cardInfo {
+- (void)getRoomMicroItems:(NSInteger)micCount cardInfo:(XPUserCardInfoModel *)cardInfo {
     [self.functionArray removeAllObjects];
     RoomInfoModel * roomInfo = cardInfo.roomInfo;
     NSMutableDictionary * micQueue = cardInfo.micQueue;
diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m
index bc7dd9f1..e4ff508a 100644
--- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m
+++ b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m
@@ -918,7 +918,6 @@
     UserRoomCardMicActionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class])
                                                                                 forIndexPath:indexPath];
     [cell.contentView setBackgroundColor:[UIColor clearColor]];
-//    [cell.contentView setCornerRadius:19 corners:UIRectCornerBottomLeft | UIRectCornerBottomRight];
     cell.userInfo = userInfo;
     cell.models = models;
     cell.handleTapIcon = tapIcon;
@@ -928,43 +927,13 @@
 
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
-
-//        // 1. 创建 UIScrollView
-//        UIScrollView *scrollView = [[UIScrollView alloc] init];
-//        scrollView.backgroundColor = [UIColor yellowColor];
-//        scrollView.bounces = YES; // 允许回弹
-//        [self.contentView addSubview:scrollView];
-//
-//        // 添加 scrollView 约束
-//        [scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
-////            make.edges.equalTo(self.contentView); // scrollView 填充整个视图
-//            make.top.mas_equalTo(self.contentView).offset(2);
-//            make.leading.mas_equalTo(self.contentView);
-//            make.height.mas_equalTo(42);
-//            make.width.mas_equalTo(self.contentView);
-//            make.width.lessThanOrEqualTo(self.contentView).offset(-30);
-//        }];
-
         [self.contentView addSubview:self.iconStack];
         [self.iconStack mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.top.mas_equalTo(self.contentView).offset(10);
             make.center.mas_equalTo(self.contentView);
             make.width.lessThanOrEqualTo(self.contentView).offset(-30);
         }];
         
         [self.contentView addSubview:self.lineView];
-//        [self.line mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.centerX.mas_equalTo(self.contentView);
-//            make.top.mas_equalTo(self.iconStack);
-//            make.width.mas_equalTo(100);//.offset(-30);
-//            make.height.mas_equalTo(10);
-//        }];
-        // 2. StackView 约束
-//        [self.iconStack mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.edges.equalTo(scrollView); // 充满 ScrollView
-//            make.height.equalTo(scrollView); // 高度等于 ScrollView 的高度
-//        }];
-        
     }
     return self;
 }
@@ -1089,6 +1058,8 @@
 
 @property(nonatomic, strong) UIView *toastView;
 
+@property(nonatomic, strong) UIActivityIndicatorView *loading;
+
 @end
 
 @implementation UserRoomCardViewController
@@ -1124,7 +1095,7 @@
                       action:@selector(didTapEmptySpace)
             forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:dismissButton];
-    
+        
     [self.view addSubview:self.collectionView];
     [self.view addSubview:self.avatar];
     [self.avatar mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -1138,6 +1109,22 @@
         make.top.leading.trailing.mas_equalTo(self.collectionView);
         make.height.mas_equalTo(self.collectionView.mas_height);
     }];
+    
+    if (@available(iOS 13.0, *)) {
+        _loading = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleMedium];
+    } else {
+        _loading = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+    }
+    _loading.hidesWhenStopped = YES;
+    [_loading startAnimating];
+    [self.view addSubview:self.loading];
+    self.loading.center = self.avatar.center;
+    [self.loading mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.center.mas_equalTo(self.collectionView);
+        make.size.mas_equalTo(CGSizeMake(40, 40));
+    }];
+    self.avatar.userInteractionEnabled = NO;
+    self.collectionView.userInteractionEnabled = NO;
 }
 
 - (void)loadUserInfo {
@@ -1276,7 +1263,6 @@
     UILabel *tipContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_19") font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)];
     tipContentLabel.numberOfLines = 0;
     UIImageView *ruleImageView = [[UIImageView alloc] initWithImage:kImage(@"room_manager_limit")];
-//    ruleImageView.contentMode = UIViewContentModeScaleAspectFit;
     UIButton *confirmButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [confirmButton addTarget:self action:@selector(removeManagerLimitToast) forControlEvents:UIControlEventTouchUpInside];
     [confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal];
@@ -1310,8 +1296,6 @@
         make.leading.trailing.mas_equalTo(tipContentLabel);
         make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(70);
         make.bottom.mas_equalTo(confirmButton.mas_top).offset(-10);
-//        make.top.mas_equalTo(view).offset(kGetScaleWidth(10));
-//        make.bottom.mas_equalTo(view.mas_bottom).offset(-kGetScaleWidth(60));
     }];
     
     return view;
@@ -1347,7 +1331,6 @@
             [self.presenter kickDownMicro:self.cardInfo.position roomId:roomId];
         }
     } else {
-//        self.operaStackView.hidden = YES;
         self.upMicFlag = YES;
         NSInteger micCount = 9;
         switch (self.cardInfo.roomInfo.type) {
@@ -1421,7 +1404,9 @@
             TTAlertConfig *config = [[TTAlertConfig alloc] init];
             config.title = @"";
             config.message = message;
+            @kWeakify(self);
             [TTPopup alertWithConfig:config confirmHandler:^{
+                @kStrongify(self);
                 if ([self isSuperUser]) {
                     [self.presenter superAdminKickUser:self.userInfoModel.nick cardInfo:self.cardInfo];
                 } else {
@@ -1434,7 +1419,9 @@
             TTAlertConfig *config = [[TTAlertConfig alloc] init];
             config.title = YMLocalizedString(@"XPUserCardViewController10");
             config.message = message;
+            @kWeakify(self);
             [TTPopup alertWithConfig:config confirmHandler:^{
+                @kStrongify(self);
                 if ([self isSuperUser]) {
                     [self.presenter superAdminKickUser:self.userInfoModel.nick cardInfo:self.cardInfo];
                 } else {
@@ -1680,11 +1667,9 @@
     }
     if (![NSString isEmpty:mp4Path]) {
         if (self.topMP4View.superview == nil) {
-//            [self.view insertSubview:self.topMP4View belowSubview:self.avatar];
             [self.view insertSubview:self.topMP4View aboveSubview:self.vipBGImageView];
             [self.topMP4View mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.leading.trailing.mas_equalTo(self.view).inset(-34);
-    //            make.bottom.mas_equalTo(self.collectionView.mas_top).offset(180);
                 make.centerY.mas_equalTo(self.avatar).offset(50);
                 make.height.mas_equalTo(300);
             }];
@@ -1702,12 +1687,15 @@
         }];
     }
     
-    
     if (userInfo.userVipInfoVO.vipLevel>0 &&
         userInfo.userVipInfoVO.userCardBG.length > 0 &&
         needLoadVIPbg)  {
         self.vipBGImageView.imageUrl = [userInfo.userVipInfoVO.userCardBG stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     }
+    
+    self.avatar.userInteractionEnabled = YES;
+    self.collectionView.userInteractionEnabled = YES;
+    [self.loading stopAnimating];
 }
 
 - (void)onGetFunctionArraySccess:(NSArray<XPUserCardItemModel *> *)array {