修正 UI 验收问题

修正 UI 反馈
Merge branch 'test/remove_resource' into feature/1.0.14
2024-07-15 11:17:04 +08:00 · 2024-07-12 15:53:11 +08:00 · 2024-07-12 14:08:29 +08:00 · 2024-07-12 14:07:53 +08:00 · 2024-07-11 18:57:34 +08:00 · 2024-07-11 13:37:43 +08:00
1599 changed files with 16743 additions and 13529 deletions
--- a/5
+++ b/5
@@ -64,10 +64,9 @@ target 'YuMi' do
  
  pod 'UMCommon'
  pod 'UMDevice'
-  pod 'lottie-ios'
-  pod 'WeexSDK'
+#  pod 'lottie-ios'
  pod 'ZLCollectionViewFlowLayout'
-  pod 'WMZDropDownMenu'
+#  pod 'WMZDropDownMenu'
  pod 'TABAnimated'
  pod 'YuMi',:path=>'yum'
  pod 'QCloudCOSXML'	
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@

 /* Begin PBXBuildFile section */
 		140A7F52299CC69000841594 /* XPTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A7F51299CC69000841594 /* XPTabBar.m */; };
-		140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A818C299CFF1C00841594 /* XPVendorCallViewController.m */; };
 		1427212529A7566100C7C423 /* ZegoAudioRoom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; };
 		1427212629A7566100C7C423 /* ZegoAudioRoom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		1427212C29A757EC00C7C423 /* MonentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */; };
@@ -521,6 +520,35 @@
 		23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */; };
 		23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */; };
 		23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */; };
+		541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */; };
+		5458319D2C2AE09300364026 /* XPRoomTypeSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */; };
+		545831A02C2AEFAF00364026 /* TenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319F2C2AEFAF00364026 /* TenMicStageView.m */; };
+		545831A32C2AF01100364026 /* FifteenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545831A22C2AF01100364026 /* FifteenMicStageView.m */; };
+		545831A62C2C085C00364026 /* ArabMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545831A52C2C085C00364026 /* ArabMicroView.m */; };
+		545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */; };
+		545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */; };
+		547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */; };
+		548E01C52C3F78360071C83D /* FeedBackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 548E01C22C3F78360071C83D /* FeedBackViewController.xib */; };
+		548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C42C3F78360071C83D /* FeedBackViewController.m */; };
+		548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C82C3F78600071C83D /* FeedBackConfigModel.m */; };
+		548E01CC2C3FB1C70071C83D /* i18nGiftNameMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */; };
+		54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */; };
+		54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; };
+		54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; };
+		54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */; };
+		54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */; };
+		54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */; };
+		54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */; };
+		54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */; };
+		54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */; };
+		54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */; };
+		54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */; };
+		54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */; };
+		54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */; };
+		54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */; };
+		54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693A2C2A984D00A83655 /* MedalModel.m */; };
+		54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */; };
+		54F469412C2AB56900A83655 /* XPMineGiftsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */; };
 		73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; };
 		9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
 		9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
@@ -678,7 +706,6 @@
 		E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */; };
 		E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; };
 		E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */; };
-		E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086427F318620027B30C /* XPRoomPKPlayingView.m */; };
 		E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */; };
 		E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0711280D0A6700A79F63 /* FansInfoModel.m */; };
 		E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0733280D740600A79F63 /* MessageContentGuildView.m */; };
@@ -911,7 +938,6 @@
 		E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MonentsTopicModel.m */; };
 		E81A654928351B9500F55894 /* XPMonentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */; };
 		E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */; };
-		E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */; };
 		E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */; };
 		E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */; };
 		E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */; };
@@ -930,7 +956,7 @@
 		E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */; };
 		E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C27AD26EF39AB0031E639 /* AppDelegate+ThirdConfig.m */; };
 		E81D58822720082A003063FE /* MicroWaveView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81D58812720082A003063FE /* MicroWaveView.m */; };
-		E81DCCCD282B63B40039E5C5 /* XPMonentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCC282B63B40039E5C5 /* XPMonentsViewController.m */; };
+		E81DCCCD282B63B40039E5C5 /* XPMomentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */; };
 		E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */; };
 		E81E09C9290F71BF00A1F410 /* XPAdvertiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09C8290F71BF00A1F410 /* XPAdvertiseView.m */; };
 		E81E09CC290F732600A1F410 /* XPAdImageTool.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09CB290F732600A1F410 /* XPAdImageTool.m */; };
@@ -1456,7 +1482,7 @@
 		E8D34D6728084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */; };
 		E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */; };
 		E8D4824D278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */; };
-		E8D48250278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */; };
+		E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */; };
 		E8D48253278D8228003C1D08 /* AcrossRoomPKPanelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */; };
 		E8D48256278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */; };
 		E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */; };
@@ -1553,8 +1579,6 @@
 /* Begin PBXFileReference section */
 		140A7F50299CC69000841594 /* XPTabBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTabBar.h; sourceTree = "<group>"; };
 		140A7F51299CC69000841594 /* XPTabBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTabBar.m; sourceTree = "<group>"; };
-		140A818B299CFF1C00841594 /* XPVendorCallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPVendorCallViewController.h; sourceTree = "<group>"; };
-		140A818C299CFF1C00841594 /* XPVendorCallViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPVendorCallViewController.m; sourceTree = "<group>"; };
 		1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZegoAudioRoom.framework; sourceTree = "<group>"; };
 		1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MonentsListInfoModel.m; sourceTree = "<group>"; };
 		1427212B29A757EC00C7C423 /* MonentsListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonentsListInfoModel.h; sourceTree = "<group>"; };
@@ -2562,6 +2586,64 @@
 		23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMenuSourceModel.m; sourceTree = "<group>"; };
 		23FF428C2AAB2D3A0055733C /* XPCandyTreeBuyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeBuyView.h; sourceTree = "<group>"; };
 		23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuyView.m; sourceTree = "<group>"; };
+		541DD9532C1EDEFB00B616C4 /* XPHomePagingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomePagingViewController.h; sourceTree = "<group>"; };
+		541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomePagingViewController.m; sourceTree = "<group>"; };
+		5458319B2C2AE09300364026 /* XPRoomTypeSelectionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTypeSelectionViewController.h; sourceTree = "<group>"; };
+		5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTypeSelectionViewController.m; sourceTree = "<group>"; };
+		5458319E2C2AEFAF00364026 /* TenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenMicStageView.h; sourceTree = "<group>"; };
+		5458319F2C2AEFAF00364026 /* TenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenMicStageView.m; sourceTree = "<group>"; };
+		545831A12C2AF01100364026 /* FifteenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FifteenMicStageView.h; sourceTree = "<group>"; };
+		545831A22C2AF01100364026 /* FifteenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FifteenMicStageView.m; sourceTree = "<group>"; };
+		545831A42C2C085C00364026 /* ArabMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArabMicroView.h; sourceTree = "<group>"; };
+		545831A52C2C085C00364026 /* ArabMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArabMicroView.m; sourceTree = "<group>"; };
+		545888312C1AFFB500897585 /* XPRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelView.h; sourceTree = "<group>"; };
+		545888322C1AFFB500897585 /* XPRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelView.m; sourceTree = "<group>"; };
+		545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPaneAvatarView.h; sourceTree = "<group>"; };
+		545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPaneAvatarView.m; sourceTree = "<group>"; };
+		5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserViewHeader.h; sourceTree = "<group>"; };
+		547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserViewHeader.m; sourceTree = "<group>"; };
+		548E01C22C3F78360071C83D /* FeedBackViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FeedBackViewController.xib; sourceTree = "<group>"; };
+		548E01C32C3F78360071C83D /* FeedBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackViewController.h; sourceTree = "<group>"; };
+		548E01C42C3F78360071C83D /* FeedBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackViewController.m; sourceTree = "<group>"; };
+		548E01C72C3F78600071C83D /* FeedBackConfigModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackConfigModel.h; sourceTree = "<group>"; };
+		548E01C82C3F78600071C83D /* FeedBackConfigModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackConfigModel.m; sourceTree = "<group>"; };
+		548E01CA2C3FB1C70071C83D /* i18nGiftNameMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = i18nGiftNameMap.h; sourceTree = "<group>"; };
+		548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = i18nGiftNameMap.m; sourceTree = "<group>"; };
+		54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineViewController.h; sourceTree = "<group>"; };
+		54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMineViewController.m; sourceTree = "<group>"; };
+		54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMinePresenter.h; sourceTree = "<group>"; };
+		54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMinePresenter.m; sourceTree = "<group>"; };
+		54C389602C23BD1600FD47B1 /* HomeRankAvatarModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeRankAvatarModel.h; sourceTree = "<group>"; };
+		54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRankAvatarModel.m; sourceTree = "<group>"; };
+		54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineProtocol.h; sourceTree = "<group>"; };
+		54C389652C24464600FD47B1 /* HomeMineRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeMineRoomModel.h; sourceTree = "<group>"; };
+		54C389662C24464600FD47B1 /* HomeMineRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMineRoomModel.m; sourceTree = "<group>"; };
+		54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGameMateTableViewCell.h; sourceTree = "<group>"; };
+		54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGameMateTableViewCell.m; sourceTree = "<group>"; };
+		54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGameMateOrderView.h; sourceTree = "<group>"; };
+		54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGameMateOrderView.m; sourceTree = "<group>"; };
+		54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListViewController.h; sourceTree = "<group>"; };
+		54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListViewController.m; sourceTree = "<group>"; };
+		54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListTableViewCell.h; sourceTree = "<group>"; };
+		54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListTableViewCell.m; sourceTree = "<group>"; };
+		54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+GameOrder.h"; sourceTree = "<group>"; };
+		54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+GameOrder.m"; sourceTree = "<group>"; };
+		54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGamePartnerInfoModel.h; sourceTree = "<group>"; };
+		54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGamePartnerInfoModel.m; sourceTree = "<group>"; };
+		54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderModel.h; sourceTree = "<group>"; };
+		54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderModel.m; sourceTree = "<group>"; };
+		54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderView.h; sourceTree = "<group>"; };
+		54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderView.m; sourceTree = "<group>"; };
+		54F469332C29711400A83655 /* XPMomentUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentUserDataViewController.h; sourceTree = "<group>"; };
+		54F469342C29711400A83655 /* XPMomentUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentUserDataViewController.m; sourceTree = "<group>"; };
+		54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAlbumTableViewCell.h; sourceTree = "<group>"; };
+		54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAlbumTableViewCell.m; sourceTree = "<group>"; };
+		54F469392C2A984D00A83655 /* MedalModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalModel.h; sourceTree = "<group>"; };
+		54F4693A2C2A984D00A83655 /* MedalModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalModel.m; sourceTree = "<group>"; };
+		54F4693C2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMedalsTableViewCell.h; sourceTree = "<group>"; };
+		54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMedalsTableViewCell.m; sourceTree = "<group>"; };
+		54F4693F2C2AB56900A83655 /* XPMineGiftsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGiftsTableViewCell.h; sourceTree = "<group>"; };
+		54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGiftsTableViewCell.m; sourceTree = "<group>"; };
 		7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = "<group>"; };
 		9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = "<group>"; };
 		9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
@@ -2887,8 +2969,6 @@
 		E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = "<group>"; };
 		E80A086027F2AC190027B30C /* RoomPKDetailInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKDetailInfoModel.h; sourceTree = "<group>"; };
 		E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKDetailInfoModel.m; sourceTree = "<group>"; };
-		E80A086327F318620027B30C /* XPRoomPKPlayingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPlayingView.h; sourceTree = "<group>"; };
-		E80A086427F318620027B30C /* XPRoomPKPlayingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPlayingView.m; sourceTree = "<group>"; };
 		E80A63DA28B86B9700690914 /* MessageContentMonentsAutoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentMonentsAutoView.h; sourceTree = "<group>"; };
 		E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentMonentsAutoView.m; sourceTree = "<group>"; };
 		E80B0710280D0A6700A79F63 /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = "<group>"; };
@@ -3185,8 +3265,6 @@
 		E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendHeaderView.m; sourceTree = "<group>"; };
 		E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicCollectionViewCell.h; sourceTree = "<group>"; };
 		E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicCollectionViewCell.m; sourceTree = "<group>"; };
-		E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKProgressView.h; sourceTree = "<group>"; };
-		E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKProgressView.m; sourceTree = "<group>"; };
 		E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelUserView.h; sourceTree = "<group>"; };
 		E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelUserView.m; sourceTree = "<group>"; };
 		E81C1B1927705F4B0020D1E4 /* XPArrangeMicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicProtocol.h; sourceTree = "<group>"; };
@@ -3224,8 +3302,8 @@
 		E81D587B271FBC3B003063FE /* RtcInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcInterface.h; sourceTree = "<group>"; };
 		E81D58802720082A003063FE /* MicroWaveView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroWaveView.h; sourceTree = "<group>"; };
 		E81D58812720082A003063FE /* MicroWaveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroWaveView.m; sourceTree = "<group>"; };
-		E81DCCCB282B63B40039E5C5 /* XPMonentsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsViewController.h; sourceTree = "<group>"; };
-		E81DCCCC282B63B40039E5C5 /* XPMonentsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsViewController.m; sourceTree = "<group>"; };
+		E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsViewController.h; sourceTree = "<group>"; };
+		E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsViewController.m; sourceTree = "<group>"; };
 		E81DCCCE282B63FD0039E5C5 /* XPMonentsRecommendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsRecommendViewController.h; sourceTree = "<group>"; };
 		E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendViewController.m; sourceTree = "<group>"; };
 		E81E09C7290F71BF00A1F410 /* XPAdvertiseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAdvertiseView.h; sourceTree = "<group>"; };
@@ -4317,8 +4395,8 @@
 		E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteView.m; sourceTree = "<group>"; };
 		E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKInviteResultView.h; sourceTree = "<group>"; };
 		E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteResultView.m; sourceTree = "<group>"; };
-		E8D4824E278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrpssRoomPKPanelView.h; sourceTree = "<group>"; };
-		E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrpssRoomPKPanelView.m; sourceTree = "<group>"; };
+		E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelView.h; sourceTree = "<group>"; };
+		E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPanelView.m; sourceTree = "<group>"; };
 		E8D48251278D8228003C1D08 /* AcrossRoomPKPanelModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AcrossRoomPKPanelModel.h; sourceTree = "<group>"; };
 		E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AcrossRoomPKPanelModel.m; sourceTree = "<group>"; };
 		E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelUserView.h; sourceTree = "<group>"; };
@@ -4932,6 +5010,8 @@
 				E8EEB8F626FC2673007C6EBA /* UserPhoto.m */,
 				9B2A12DC2783FEDD00CED41B /* UserVipInfoVo.h */,
 				9B2A12DD2783FEDD00CED41B /* UserVipInfoVo.m */,
+				54F469392C2A984D00A83655 /* MedalModel.h */,
+				54F4693A2C2A984D00A83655 /* MedalModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -5002,6 +5082,9 @@
 		189DD58A26DF978700AB55B1 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				548E01C32C3F78360071C83D /* FeedBackViewController.h */,
+				548E01C42C3F78360071C83D /* FeedBackViewController.m */,
+				548E01C22C3F78360071C83D /* FeedBackViewController.xib */,
 				14DCAD12299B9B0B00A7DD31 /* NewLogin */,
 				E872308A26E89D5100B90D4F /* CustomView */,
 				E8B825C926EA1231009E8E9F /* LoginVerifCodeViewController.h */,
@@ -5237,6 +5320,8 @@
 				235714762BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m */,
 				234E50A32BF5E556005CB6D5 /* MessageContentChatHallHeadView.h */,
 				234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */,
+				54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */,
+				54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */,
 			);
 			path = Content;
 			sourceTree = "<group>";
@@ -7091,12 +7176,10 @@
 				E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */,
 				E8664ED427E434D5000171BA /* XPRoomPKRecordViewController.h */,
 				E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */,
-				E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */,
-				E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */,
-				E80A086327F318620027B30C /* XPRoomPKPlayingView.h */,
-				E80A086427F318620027B30C /* XPRoomPKPlayingView.m */,
 				E84843AD27F59E7E0050D365 /* XPRoomPKResultView.h */,
 				E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */,
+				545888312C1AFFB500897585 /* XPRoomPKPanelView.h */,
+				545888322C1AFFB500897585 /* XPRoomPKPanelView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7163,6 +7246,8 @@
 				E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */,
 				E84843B027F5A0740050D365 /* XPRomPKResultTitleLabel.h */,
 				E84843B127F5A0740050D365 /* XPRomPKResultTitleLabel.m */,
+				545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */,
+				545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -7511,6 +7596,8 @@
 				235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */,
 				235714902BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.h */,
 				235714912BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.m */,
+				54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */,
+				54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */,
 			);
 			path = SesssionModel;
 			sourceTree = "<group>";
@@ -7708,8 +7795,8 @@
 			children = (
 				E8D7D748282BA1C90007D7BD /* SubViews */,
 				E8D7D747282BA1C20007D7BD /* Cell */,
-				E81DCCCB282B63B40039E5C5 /* XPMonentsViewController.h */,
-				E81DCCCC282B63B40039E5C5 /* XPMonentsViewController.m */,
+				E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */,
+				E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */,
 				E81DCCCE282B63FD0039E5C5 /* XPMonentsRecommendViewController.h */,
 				E81DCCCF282B63FD0039E5C5 /* XPMonentsRecommendViewController.m */,
 				E81A65292834E4F600F55894 /* XPMonentsAttentionViewController.h */,
@@ -8941,6 +9028,8 @@
 				9BCD02C62796C02800F396AA /* MicroNobleWaveView.m */,
 				E8DACCF92766EDC60052092C /* MicroGiftValueView.h */,
 				E8DACCFA2766EDC60052092C /* MicroGiftValueView.m */,
+				545831A42C2C085C00364026 /* ArabMicroView.h */,
+				545831A52C2C085C00364026 /* ArabMicroView.m */,
 			);
 			path = MicroView;
 			sourceTree = "<group>";
@@ -9211,6 +9300,8 @@
 				E8A3538428FD67320014A784 /* GiftLuckyBroadcastModel.m */,
 				E8D4DE452940473500EC788D /* GiftTwelveStarFirstModel.h */,
 				E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */,
+				548E01CA2C3FB1C70071C83D /* i18nGiftNameMap.h */,
+				548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -9411,6 +9502,7 @@
 				E87DF4E82A42CB24009C1185 /* XPHomeProtocol.h */,
 				E87E62692A3F5756002F68C9 /* XPHomeContainerProtocol.h */,
 				E87E627C2A3F5A63002F68C9 /* XPNewHomeRecommendProtocol.h */,
+				54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */,
 			);
 			path = Protocol;
 			sourceTree = "<group>";
@@ -9424,6 +9516,8 @@
 				E87E62662A3F571C002F68C9 /* XPHomeContainerPresenter.m */,
 				E87E62792A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.h */,
 				E87E627A2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m */,
+				54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */,
+				54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */,
 			);
 			path = Presenter;
 			sourceTree = "<group>";
@@ -9440,12 +9534,16 @@
 				E87E62582A3F560A002F68C9 /* XPHomeRecommendViewController.m */,
 				E87E625B2A3F5622002F68C9 /* XPNewHomeViewController.h */,
 				E87E625C2A3F5622002F68C9 /* XPNewHomeViewController.m */,
+				54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */,
+				54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */,
 				239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */,
 				239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */,
 				23B8D8DC2B860B8800CA472F /* PIHoemCategoryCollectionView.h */,
 				23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */,
 				23B8D8D62B85F8B900CA472F /* PIHoemCategoryTitleCell.h */,
 				23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */,
+				541DD9532C1EDEFB00B616C4 /* XPHomePagingViewController.h */,
+				541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -9478,10 +9576,14 @@
 				E87DF4CB2A42C960009C1185 /* HomeBannerInfoModel.m */,
 				E87DF4BD2A42C8C1009C1185 /* HomeTagModel.h */,
 				E87DF4BE2A42C8C1009C1185 /* HomeTagModel.m */,
+				54C389602C23BD1600FD47B1 /* HomeRankAvatarModel.h */,
+				54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */,
 				23FF42712AA6CC480055733C /* PIHomeItemModel.h */,
 				23FF42722AA6CC480055733C /* PIHomeItemModel.m */,
 				23B8D8D92B85FDDD00CA472F /* PIHomeCategoryTitleModel.h */,
 				23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */,
+				54C389652C24464600FD47B1 /* HomeMineRoomModel.h */,
+				54C389662C24464600FD47B1 /* HomeMineRoomModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -9620,8 +9722,8 @@
 				E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */,
 				E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */,
 				E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */,
-				E8D4824E278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.h */,
-				E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */,
+				E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */,
+				E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */,
 				E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */,
 				E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */,
 				E88863C4278EAFC3004BCFAB /* XPAcrossRoomPKResultView.h */,
@@ -9721,6 +9823,8 @@
 				E8EEB8FD26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m */,
 				E88B5CC326FB42B000DA9178 /* XPMineUserInfoHeaderView.h */,
 				E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */,
+				5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */,
+				547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */,
 				E8EEB91B26FC9D58007C6EBA /* XPMineUserInfoDateView.h */,
 				E8EEB91C26FC9D58007C6EBA /* XPMineUserInfoDateView.m */,
 				E873EB07280960990071030D /* XPMineUserInfoVoiceCardView.h */,
@@ -10153,6 +10257,8 @@
 				E816C11427608A7500C84014 /* XPRoomMiniManager.m */,
 				E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */,
 				E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */,
+				5458319B2C2AE09300364026 /* XPRoomTypeSelectionViewController.h */,
+				5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -10251,6 +10357,10 @@
 				181D7F1A2726CE2A00B7C059 /* StageView.m */,
 				181D7F1F2727D9DB00B7C059 /* SocialStageView.h */,
 				181D7F202727D9DB00B7C059 /* SocialStageView.m */,
+				5458319E2C2AEFAF00364026 /* TenMicStageView.h */,
+				5458319F2C2AEFAF00364026 /* TenMicStageView.m */,
+				545831A12C2AF01100364026 /* FifteenMicStageView.h */,
+				545831A22C2AF01100364026 /* FifteenMicStageView.m */,
 				E877A7E92783E24700EFACED /* DatingStageView.h */,
 				E877A7EA2783E24700EFACED /* DatingStageView.m */,
 				9B0086C427BA392B0032BD2B /* AnchorStageView.h */,
@@ -10331,6 +10441,8 @@
 		E8B825BC26E9E520009E8E9F /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				548E01C72C3F78600071C83D /* FeedBackConfigModel.h */,
+				548E01C82C3F78600071C83D /* FeedBackConfigModel.m */,
 				E81C27A926EF2D920031E639 /* ThirdUserInfo.h */,
 				E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */,
 				E818DD1D2A48974300F163F7 /* LoginAreaModel.h */,
@@ -10616,8 +10728,6 @@
 				E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */,
 				E8E20BEA2816A5B90033B688 /* XPMineBlackListViewController.h */,
 				E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */,
-				140A818B299CFF1C00841594 /* XPVendorCallViewController.h */,
-				140A818C299CFF1C00841594 /* XPVendorCallViewController.m */,
 				2305F3402AD94D5200AD403C /* XPMaskManagerVC.h */,
 				2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */,
 			);
@@ -10641,6 +10751,8 @@
 			children = (
 				E8E70D7C26F2F19D00F03460 /* Api+Mine.h */,
 				E8E70D7D26F2F19D00F03460 /* Api+Mine.m */,
+				54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */,
+				54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */,
 			);
 			path = Api;
 			sourceTree = "<group>";
@@ -10670,6 +10782,8 @@
 				E8EEB90B26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m */,
 				9B734F74288A92FB00CBDAA9 /* XPMineFuntionItemModel.h */,
 				9B734F75288A92FB00CBDAA9 /* XPMineFuntionItemModel.m */,
+				54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */,
+				54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -10689,10 +10803,14 @@
 				E8E70D7F26F2F39000F03460 /* SubViews */,
 				E8E70D7526F2F15100F03460 /* XPMineViewController.h */,
 				E8E70D7626F2F15100F03460 /* XPMineViewController.m */,
+				54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */,
+				54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */,
 				23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */,
 				23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */,
 				23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */,
 				23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */,
+				54F469332C29711400A83655 /* XPMomentUserDataViewController.h */,
+				54F469342C29711400A83655 /* XPMomentUserDataViewController.m */,
 				23E9EAA42A84C97C00B792F2 /* XPMineUserInfoTagVC.h */,
 				23E9EAA52A84C97C00B792F2 /* XPMineUserInfoTagVC.m */,
 				23E9EA962A84C37000B792F2 /* XPMineUserInfoRecordedSoundVC.h */,
@@ -10869,6 +10987,8 @@
 				236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */,
 				236B2E562AA18E12003967A8 /* XPMineGameTableViewCell.h */,
 				236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */,
+				54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */,
+				54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -10923,6 +11043,12 @@
 				E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */,
 				E8D34D4B28080351009C4835 /* XPMineDataClanTableViewCell.h */,
 				E8D34D4C28080351009C4835 /* XPMineDataClanTableViewCell.m */,
+				54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */,
+				54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */,
+				54F4693C2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.h */,
+				54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */,
+				54F4693F2C2AB56900A83655 /* XPMineGiftsTableViewCell.h */,
+				54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */,
 				E8D34D4E28080362009C4835 /* XPMineDataGiftTableViewCell.h */,
 				E8D34D4F28080362009C4835 /* XPMineDataGiftTableViewCell.m */,
 				E8D34D5428080393009C4835 /* XPMineDataGiftCollectionViewCell.h */,
@@ -10931,6 +11057,10 @@
 				E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */,
 				E873EB00280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.h */,
 				E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */,
+				54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */,
+				54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */,
+				54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */,
+				54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */,
 			);
 			path = MineInfo;
 			sourceTree = "<group>";
@@ -11076,6 +11206,7 @@
 				E80EC83228ACD84000D133C5 /* emoji_00@2x.png in Resources */,
 				E80EC89C28ACD84000D133C5 /* emoji_50@2x.png in Resources */,
 				E80EC87A28ACD84000D133C5 /* emoji_113@2x.png in Resources */,
+				548E01C52C3F78360071C83D /* FeedBackViewController.xib in Resources */,
 				23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */,
 				23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */,
 				E80EC88A28ACD84000D133C5 /* emoji_25@2x.png in Resources */,
@@ -11346,6 +11477,7 @@
 				9BD9A18027A0EFC7004186FE /* XPMineVisitorTableViewCell.m in Sources */,
 				233423D02AAEFBC300B1253F /* PICandyTreeSetModel.m in Sources */,
 				E85E7B112A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m in Sources */,
+				548E01CC2C3FB1C70071C83D /* i18nGiftNameMap.m in Sources */,
 				9BD2ECD2288F833B00F5CD9A /* XPMineFootPrintModel.m in Sources */,
 				E824546626F5FF6000BE8163 /* XPMineResetPayPasswordProtocol.h in Sources */,
 				23D321E22ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m in Sources */,
@@ -11428,6 +11560,7 @@
 				9BCB99A628F582EC00466D64 /* XPMineCollectRoomEditCell.m in Sources */,
 				E8E70D7E26F2F19D00F03460 /* Api+Mine.m in Sources */,
 				E85E7B3B2A4EB0D300B6D00A /* XPGuildSearchSuperAdminTableViewCell.m in Sources */,
+				54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */,
 				E8751E6E28A64F990056EF44 /* XPSailingEmptyTableViewCell.m in Sources */,
 				E87E625A2A3F560B002F68C9 /* XPHomeRecommendViewController.m in Sources */,
 				E8950189282CFFB1007E459A /* XPMonentsLayoutConfig.m in Sources */,
@@ -11440,6 +11573,7 @@
 				E85E7B282A4EB0D300B6D00A /* XPClanMenuView.m in Sources */,
 				9BE01AF72893E7F500B50299 /* XPNewUserRechargeCollectionViewCell.m in Sources */,
 				E81125C7296E596D000D9804 /* QInputPhototCell.m in Sources */,
+				545831A62C2C085C00364026 /* ArabMicroView.m in Sources */,
 				E8EEB8F726FC2673007C6EBA /* UserPhoto.m in Sources */,
 				E81061002987CDCC00B772F0 /* MessageTweetModel.m in Sources */,
 				E87DF4CC2A42C960009C1185 /* HomeBannerInfoModel.m in Sources */,
@@ -11460,6 +11594,7 @@
 				238B37A62AC55A2C00BFC9D5 /* TreasureFairySendRecordModel.m in Sources */,
 				E8AB632F28AE19DE0023B0D2 /* XPMonentMinePresenter.m in Sources */,
 				E85E7B042A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m in Sources */,
+				54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */,
 				9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */,
 				2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */,
 				238B37D92AC55A2C00BFC9D5 /* XPTreasureFairyTrialsRecordView.m in Sources */,
@@ -11483,7 +11618,7 @@
 				E8664EE327E47711000171BA /* XPRoomPKRecordNickView.m in Sources */,
 				E8C1CD7327D8A16500376F83 /* XPRoomFaceTool.m in Sources */,
 				236B2E462AA07D06003967A8 /* UIImage+RW.m in Sources */,
-				E81DCCCD282B63B40039E5C5 /* XPMonentsViewController.m in Sources */,
+				E81DCCCD282B63B40039E5C5 /* XPMomentsViewController.m in Sources */,
 				237700FD2BCD254000D661F1 /* MSBaseTextField.m in Sources */,
 				237700E62BC7E81F00D661F1 /* UITextField+MSRTL.m in Sources */,
 				2357149E2BEF0F6D004C81D6 /* MSSessionScrollingItemCell.m in Sources */,
@@ -11496,8 +11631,10 @@
 				E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */,
 				E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */,
 				23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */,
+				54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */,
 				9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */,
 				E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */,
+				54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */,
 				23CEFC4E2AFB8FC100576D89 /* BSNSDictionary.m in Sources */,
 				23FF426A2AA5DF050055733C /* XPNewHomePartyTagView.m in Sources */,
 				E85E7BA22A4EC99300B6D00A /* XPMineGiveDiamondSearchModel.m in Sources */,
@@ -11507,6 +11644,7 @@
 				E87E62682A3F571D002F68C9 /* XPHomeContainerPresenter.m in Sources */,
 				E8EEB8F326FC2050007C6EBA /* SDWaitingView.m in Sources */,
 				E85E7B2F2A4EB0D300B6D00A /* XPGoldIncomeSectionView.m in Sources */,
+				54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */,
 				23E9EAA12A84C53900B792F2 /* TTNewAlertView.m in Sources */,
 				238B37BC2AC55A2C00BFC9D5 /* XPTreasureFairySendView.m in Sources */,
 				E8DEC9A12764A5D20078CB70 /* XPRoomMoreItemModel.m in Sources */,
@@ -11582,6 +11720,7 @@
 				23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */,
 				E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */,
 				E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */,
+				54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */,
 				E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */,
 				E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */,
 				1427218E29A75F6F00C7C423 /* HTTPMessage.m in Sources */,
@@ -11621,6 +11760,7 @@
 				E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */,
 				E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */,
 				E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */,
+				54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */,
 				2331C1B12A60F32D00E1D940 /* XPCandyTreeGiftView.m in Sources */,
 				9B1B72BC28003E06003FACE9 /* XPAnchorPKTableViewCell.m in Sources */,
 				E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */,
@@ -11660,7 +11800,6 @@
 				E8D34D6028082BA5009C4835 /* XPMineUserDataPresenter.m in Sources */,
 				E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */,
 				238B37A52AC55A2C00BFC9D5 /* TreasureFailyKeyInfoModel.m in Sources */,
-				140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */,
 				E8EEB8F226FC2050007C6EBA /* SDPhotoBrowser.m in Sources */,
 				23CEFC4F2AFB8FC100576D89 /* BSSDLayoutUtil.m in Sources */,
 				E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */,
@@ -11687,6 +11826,7 @@
 				9B32A04728881845002009D2 /* XPRoomTagListView.m in Sources */,
 				E85E7B1D2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m in Sources */,
 				189DD55A26DE39D200AB55B1 /* BaseMvpPresenter.m in Sources */,
+				5458319D2C2AE09300364026 /* XPRoomTypeSelectionViewController.m in Sources */,
 				1427219029A75F6F00C7C423 /* WebSocket.m in Sources */,
 				E83ABEF9280EAF3F00322EE4 /* MessageContentOpenLiveView.m in Sources */,
 				E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */,
@@ -11717,10 +11857,10 @@
 				E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */,
 				237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */,
 				239D0FFA2C05BE9B002977CE /* MSRoomGameVictoryCell.m in Sources */,
+				54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */,
 				23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */,
 				2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */,
 				E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */,
-				E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */,
 				2305F33B2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m in Sources */,
 				E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */,
 				E818DD1F2A48974300F163F7 /* LoginAreaModel.m in Sources */,
@@ -11843,6 +11983,7 @@
 				236B2E492AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m in Sources */,
 				2305EF042AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m in Sources */,
 				2305EEF02AD677F200AD403C /* PIRoomPhotoAlbumVC.m in Sources */,
+				54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */,
 				14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */,
 				E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */,
 				189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */,
@@ -11923,6 +12064,7 @@
 				E85E7B222A4EB0D300B6D00A /* XPMineGuildIncomeRecordViewController.m in Sources */,
 				9BD2ECD5288F838200F5CD9A /* XPMineFootPrintPresenter.m in Sources */,
 				9B1B72BF2800422E003FACE9 /* XPAnchorPKRuleView.m in Sources */,
+				54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */,
 				1427219729A75F6F00C7C423 /* DDRange.m in Sources */,
 				E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */,
 				23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */,
@@ -12009,6 +12151,7 @@
 				23E9EA9A2A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m in Sources */,
 				E8E20BDE28164D3A0033B688 /* SessionNavView.m in Sources */,
 				9B734F76288A92FB00CBDAA9 /* XPMineFuntionItemModel.m in Sources */,
+				541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */,
 				E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */,
 				238B37CC2AC55A2C00BFC9D5 /* XPTreasureFairyPrizeSubView.m in Sources */,
 				E81125C4296E57B7000D9804 /* QinputPhotoView.m in Sources */,
@@ -12016,7 +12159,7 @@
 				9B3C181A292CE4FA003AF543 /* XPAnchorPKMatchView.m in Sources */,
 				E80EC80D28ACD84000D133C5 /* QInputBarView.m in Sources */,
 				23E9EA852A84B6FD00B792F2 /* XPSoundCardModel.m in Sources */,
-				E8D48250278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m in Sources */,
+				E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */,
 				23E9E9B52A81E8E900B792F2 /* XPAdjustEvent.m in Sources */,
 				18F404C3276098F100A6C548 /* Api+Message.m in Sources */,
 				9B85B6D7279FDABA00A0A1AC /* XPUserCardSkillCardView.m in Sources */,
@@ -12062,6 +12205,7 @@
 				236B2E432AA07D06003967A8 /* NSString+RW.m in Sources */,
 				239D0FC92C045F92002977CE /* MSRoomGameVC.m in Sources */,
 				E85E7B172A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m in Sources */,
+				54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */,
 				9B044DA0282D32F700DE4859 /* MicroInviteExtModel.m in Sources */,
 				E8D7D74B282BA1EC0007D7BD /* XPMonentsTableViewCell.m in Sources */,
 				E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */,
@@ -12073,6 +12217,7 @@
 				E84150C527747E0900A7F548 /* FirstRechargeRewardModel.m in Sources */,
 				E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */,
 				239D0FDB2C047F24002977CE /* MSTabbarRoomGameCell.m in Sources */,
+				54F469412C2AB56900A83655 /* XPMineGiftsTableViewCell.m in Sources */,
 				239D0FB02BFD8C4D002977CE /* MSRoomSetingBackdropVC.m in Sources */,
 				235714982BEDF54E004C81D6 /* MsRoomMessageMainView.m in Sources */,
 				237852A72C08764B00E360AC /* MSRoomGameResultsModel.m in Sources */,
@@ -12170,6 +12315,7 @@
 				E87E62622A3F568A002F68C9 /* XPNewHomeNavView.m in Sources */,
 				18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */,
 				E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */,
+				545831A32C2AF01100364026 /* FifteenMicStageView.m in Sources */,
 				E8AB632428AE10310023B0D2 /* XPMoentsTopicListViewController.m in Sources */,
 				E8098CAA282E03B40090B9F0 /* XPMonentsRecommendPresenter.m in Sources */,
 				E8F63CBB298B648300B338BA /* SessionSayHelloListModel.m in Sources */,
@@ -12194,7 +12340,6 @@
 				E81060F42987C6B200B772F0 /* MessageOpenLiveModel.m in Sources */,
 				E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */,
 				9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */,
-				E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */,
 				E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */,
 				9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */,
 				E85E7BC22A4EE82300B6D00A /* XPMineListCell.m in Sources */,
@@ -12206,6 +12351,7 @@
 				E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */,
 				E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */,
 				9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */,
+				54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */,
 				23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */,
 				9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */,
 				E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */,
@@ -12253,6 +12399,7 @@
 				238B37D02AC55A2C00BFC9D5 /* XPTreasureFairySummonGiftView.m in Sources */,
 				14DCAD0E299B6AD900A7DD31 /* XPForgetPwdViewController.m in Sources */,
 				23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */,
+				545831A02C2AEFAF00364026 /* TenMicStageView.m in Sources */,
 				9BE9F0FF27FED76500667200 /* XPAnchorFansTaskModel.m in Sources */,
 				E85E7BAA2A4EC99300B6D00A /* XPMineGiveDiamondPwdView.m in Sources */,
 				23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */,
@@ -12285,6 +12432,7 @@
 				E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */,
 				23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */,
 				186A536B26FC6F2E00D67B2C /* XPShareItemCell.m in Sources */,
+				54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */,
 				237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */,
 				23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */,
 				9B42869228C1AED4009034D2 /* XPReceiveRedPacketModel.m in Sources */,
@@ -12331,6 +12479,7 @@
 				E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */,
 				9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */,
 				E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */,
+				54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */,
 				E85E7BA72A4EC99300B6D00A /* XPMineGiveDiamondPasswordView.m in Sources */,
 				2331C1742A5EB71000E1D940 /* XPNobleCenterResidueView.m in Sources */,
 				E80E2377299A47F60013FD40 /* AESUtils.m in Sources */,
@@ -12363,6 +12512,7 @@
 				E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */,
 				238B37C42AC55A2C00BFC9D5 /* XPTreasureFairyBallContentView.m in Sources */,
 				E8C1CD6D27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m in Sources */,
+				548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */,
 				E8C1CD7627D8AE3D00376F83 /* XPRoomFacePresenter.m in Sources */,
 				E85E7B362A4EB0D300B6D00A /* XPClanRoomCollectionViewCell.m in Sources */,
 				18F4043A275E20D900A6C548 /* TRTCRtcImpl.m in Sources */,
@@ -12416,6 +12566,7 @@
 				E8AC722126F47E23007D6E91 /* XPMineAboutUsViewController.m in Sources */,
 				E8E21A9E28B4DFE8008F7C9D /* XPSailingBuyFuelView.m in Sources */,
 				18F403CB2758C66800A6C548 /* MessageContentText.m in Sources */,
+				547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */,
 				E87DF4E72A42CB00009C1185 /* XPHomePresenter.m in Sources */,
 				2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */,
 				E8232600274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m in Sources */,
@@ -12460,6 +12611,7 @@
 				E80EC80F28ACD84000D133C5 /* QEmotion.m in Sources */,
 				E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */,
 				9BD2ECDA288F867000F5CD9A /* XPMineFootPrintTableViewCell.m in Sources */,
+				545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */,
 				E8395339276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m in Sources */,
 				238B37CB2AC55A2C00BFC9D5 /* XPTreasureFairyWebView.m in Sources */,
 				E875FA8727D619820086ED04 /* ClientDataModel.m in Sources */,
@@ -12481,6 +12633,7 @@
 				E8395334276A03C300CF2F24 /* XPMineDressUpPresenter.m in Sources */,
 				2357148F2BEDC94D004C81D6 /* MSSessionPublicChatHalImageCell.m in Sources */,
 				E85E7B212A4EB0D300B6D00A /* XPNewMineGuildIncomeRecordViewController.m in Sources */,
+				54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */,
 				23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */,
 				189DD75926E6003C00AB55B1 /* Api.m in Sources */,
 				2331C1652A5EB71000E1D940 /* NobleRechargeModel.m in Sources */,
@@ -12489,6 +12642,7 @@
 				23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */,
 				9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */,
 				E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */,
+				548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */,
 				E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */,
 				E85E7B412A4EB0D300B6D00A /* XPMineGuildEmptyTableViewCell.m in Sources */,
 				E8133916273E532D00708B66 /* XPGiftItemCollectionViewCell.m in Sources */,
@@ -12563,9 +12717,11 @@
 				1427218829A75F6F00C7C423 /* HTTPErrorResponse.m in Sources */,
 				E85E7B032A4EB0D200B6D00A /* XPGuildIncomePresenter.m in Sources */,
 				E8A30BF928534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m in Sources */,
+				545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */,
 				E896EFB22771C93B00AD2CC1 /* XPMineFriendNumberView.m in Sources */,
 				14EB640D29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m in Sources */,
 				E80EC80E28ACD84000D133C5 /* QKeyboardBaseManager.m in Sources */,
+				54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */,
 				23E9EA792A8385CC00B792F2 /* XPTreasureFairyGiftView.m in Sources */,
 				149839C7299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m in Sources */,
 				236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */,
@@ -12770,10 +12926,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.23;
+				MARKETING_VERSION = 20.20.28;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -12808,10 +12968,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.23;
+				MARKETING_VERSION = 20.20.28;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -72,7 +72,7 @@
      buildConfiguration = "Debug">
   </AnalyzeAction>
   <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
      revealArchiveInOrganizer = "YES">
   </ArchiveAction>
 </Scheme>
--- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m
+++ b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m
@@ -31,55 +31,47 @@

 #import "YuMi-swift.h"

-
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;

-
-
@implementation AppDelegate (ThirdConfig)

-
 /// 初始化一些第三方配置
- (void)initThirdConfig {
+- (void)initThirdConfig{
+    [self setLanguage];
 	[self configShareSDK];
 	[self configNIMSDK];
-	[self initEmojiData];
    [self configAdjust];
    [self configBugly];
    [self registerNot];
-    [self setLanguage];
+    [self initEmojiData];
 }
+
 -(void)setLanguage{
-    
+    UISemanticContentAttribute attribute = UISemanticContentAttributeForceLeftToRight;
    if (isMSRTL()) {
-        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-
-
-    } else {
-        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-
-
+        attribute = UISemanticContentAttributeForceRightToLeft;
    }
+
+    [UIView appearance].semanticContentAttribute = attribute;
+    [UISearchBar appearance].semanticContentAttribute = attribute;
 }
+
 -(void)registerNot{
    if (@available(iOS 10.0, *)) {
-                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-                    if (granted) {
-                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
-                                dispatch_async(dispatch_get_main_queue(), ^{
-                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
-                                });
-                            }
-                        }];
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+            if (granted) {
+                [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                    if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            [[UIApplication sharedApplication] registerForRemoteNotifications];
+                        });
                    }
                }];
            }
-   
+        }];
+    }
 }

 /**
@@ -94,14 +86,16 @@ UIKIT_EXTERN NSString * adImageName;

 #ifdef DEBUG
    config.debugMode = YES; // debug 模式下，开启调试模式
-    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
+    config.channel = [YYUtility getAppSource];
+    config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
    config.reportLogLevel = BuglyLogLevelVerbose; // 设置打印日志级别
-    [Bugly startWithAppId:@"86cf73b8d5" config:config];
+    [Bugly startWithAppId:@"c937fd00f7" config:config];
 #else
    config.debugMode = NO; // release 模式下，关闭调试模式
-    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
+    config.channel = [YYUtility getAppSource];;
+    config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
    config.reportLogLevel = BuglyLogLevelWarn; // 设置自定义日志上报的级别，默认不上报自定义日志
-    NSString *buylyKey = isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
+    NSString *buylyKey = @"8627948559"; // isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
    [Bugly startWithAppId:buylyKey config:config];
 #endif
    
@@ -115,10 +109,7 @@ UIKIT_EXTERN NSString * adImageName;
 #else
    option.apnsCername = @"newPiko";
 #endif
- 
-    

-    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -151,6 +142,7 @@ UIKIT_EXTERN NSString * adImageName;
   #endif
   [Adjust appDidLaunch:adjustConfig];
 }
+
 - (void)configShareSDK {

    [PILineLoginManager registerLine];
@@ -160,11 +152,10 @@ UIKIT_EXTERN NSString * adImageName;
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
+
    NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
    if (isUpload == nil){
-        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
-            
-        }];
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil];
        [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
        [[NSUserDefaults standardUserDefaults] synchronize];
    }
@@ -172,22 +163,24 @@ UIKIT_EXTERN NSString * adImageName;

 #pragma mark - 表情
 - (void)initEmojiData {
-	NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
-	NSDictionary * dic = [dicArray firstObject];
-	NSArray * emojiArray = dic[@"data"];
-	NSMutableArray * array = [NSMutableArray array];
-	for (int i = 0; i < emojiArray.count; i++) {
-		NSDictionary * dic = [emojiArray objectAtIndex:i];
-		UIImage * image = [UIImage imageNamed:dic[@"file"]];
-		QEmotion * info = [[QEmotion alloc] init];
-		info.identifier = dic[@"id"];
-		info.image = image;
-		info.displayName = dic[@"tag"];
-		[array addObject:info];
-	}
-	//在这里强烈建议先预加载一下表情
-	QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
-	faceManager.emotionArray = array;
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
+        NSDictionary * dic = [dicArray firstObject];
+        NSArray * emojiArray = dic[@"data"];
+        NSMutableArray * array = [NSMutableArray array];
+        for (int i = 0; i < emojiArray.count; i++) {
+            NSDictionary * dic = [emojiArray objectAtIndex:i];
+            UIImage * image = [UIImage imageNamed:dic[@"file"]];
+            QEmotion * info = [[QEmotion alloc] init];
+            info.identifier = dic[@"id"];
+            info.image = image;
+            info.displayName = dic[@"tag"];
+            [array addObject:info];
+        }
+        //在这里强烈建议先预加载一下表情
+        QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
+        faceManager.emotionArray = array;
+    });
 }

 #pragma mark - 广告
@@ -198,22 +191,21 @@ UIKIT_EXTERN NSString * adImageName;
 - (void)setupLaunchADView {
 	NSUserDefaults * kUserDefaults =  NSUserDefaults.standardUserDefaults;
 	// 判断沙盒中是否存在广告图片，如果存在，直接显示
-	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:[kUserDefaults valueForKey:adImageName]];
+    NSString *adName = [kUserDefaults stringForKey:adImageName];
+	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
 	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
-	NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];

-	if ([userDefault integerForKey:@"adShow"]) {
-		[userDefault setInteger:[userDefault integerForKey:@"adShow"]+1 forKey:@"adShow"];
+	if ([kUserDefaults integerForKey:@"adShow"]) {
+		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
+                           forKey:@"adShow"];
 	} else {
-		[userDefault setInteger:1 forKey:@"adShow"];
+		[kUserDefaults setInteger:1 forKey:@"adShow"];
 	}

 	if (isExist) {// 图片存在
-
-		if ([userDefault integerForKey:@"adShow"] > 4) {
+		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
-			NSString *imageName = [kUserDefaults valueForKey:adImageName];
-			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:imageName];
+			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
 			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
 			advertiseView.filePath = filePath;
 			advertiseView.dismissHandler = ^(BOOL shouldJump) {
@@ -222,9 +214,8 @@ UIKIT_EXTERN NSString * adImageName;
 					return;
 				}
                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
-                   });
-				
+                    [self advertiseJumpHandleWithInfo:info];
+                });
 			};
 			[advertiseView show];
 		}
--- a/YuMi/Appdelegate/AppDelegate.m
+++ b/YuMi/Appdelegate/AppDelegate.m
@@ -5,15 +5,16 @@
 //  Created by admin on 2023/3/9.
 //

+
+#import "AppDelegate.h"
+#import <UMCommon/UMCommon.h>
 #import <MobLinkPro/MobLink.h>
 #import <MobLinkPro/MLSDKScene.h>
-#import "AppDelegate.h"
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
 #import "AppDelegate+ThirdConfig.h"
 #import <NIMSDK/NIMSDK.h>
-#import <UMCommon/UMCommon.h>
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "ClientConfig.h"
 #import <GoogleSignIn/GoogleSignIn.h>
@@ -34,62 +35,77 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
@implementation AppDelegate

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-   
-   
-    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-   
-    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
-    if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) {
-        XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
-        BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc];
-        nav.modalPresentationStyle = UIModalPresentationFullScreen;
-        self.window.rootViewController = nav;
-    }else{
-        TabbarViewController *vc = [[TabbarViewController alloc] init];
-        BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
-        self.window.rootViewController = bnc;
-    }
-    
-    [self.window makeKeyAndVisible];
-	///设置广告页
-	[self setupLaunchADView];
+
 	///初始化一些 sdk配置
-	[self initThirdConfig];
-	// 只有同意过了隐私协议 才初始化
-	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
-		///初始化友盟
-		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"appstore"];
-	}
-    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
-    [FIRApp configure];
-    [MobLink setDelegate:self];
-   
-   
+    [self initThirdConfig];
+    [self initUM:application launchOptions:launchOptions];
+
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    [self.window makeKeyAndVisible];
+
+    [self loadMainPage];
+    [self setupLaunchADView];
+
    return YES;
 }

- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
-{
+- (void)initUM:(UIApplication *)application
+ launchOptions:(NSDictionary *)launchOptions {
+    // 只有同意过了隐私协议 才初始化
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
+        ///初始化友盟
+        [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
+                            channel:@"appstore"];
+    }
+    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
+    [FIRApp configure];
+    [MobLink setDelegate:self];
+}
+
+- (void)loadMainPage {
+    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
+    if (accountModel == nil || 
+        accountModel.uid == nil ||
+        accountModel.access_token == nil) {
+        [self toLoginPage];
+    }else{
+        [self toHomeTabbarPage];
+    }
+}
+
+- (void)toLoginPage {
+    XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+    BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc];
+    navigationController.modalPresentationStyle = UIModalPresentationFullScreen;
+    self.window.rootViewController = navigationController;
+}
+
+- (void)toHomeTabbarPage {
+    TabbarViewController *vc = [[TabbarViewController alloc] init];
+    BaseNavigationController *navigationController = [[BaseNavigationController alloc] initWithRootViewController:vc];
+    self.window.rootViewController = navigationController;
+}
+
+- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene
+                       Restore:(void (^)(BOOL, RestoreStyle))restoreHandler {
    NSString *inviteCode = scene.params[@"inviteCode"];
    if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
        ClientConfig *config = [ClientConfig shareConfig];
        config.inviteCode = inviteCode;
    }
-
    restoreHandler(YES, MLDefault);
-
 }

-
-
 - (void)applicationDidEnterBackground:(UIApplication *)application {
    NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
    [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
+
 - (void)applicationDidBecomeActive:(UIApplication *)application {
    [self getAdvertisingTrackingAuthority];
    [[NSNotificationCenter defaultCenter]postNotificationName:@"kAppDidBecomeActive" object:nil];
 }
+
 - (void)getAdvertisingTrackingAuthority {
    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
        if (@available(iOS 14, *)) {
@@ -146,17 +162,14 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
            config.pushChatId = userId;
        }
       });
-   
-   
-    
 }

 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
    NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
    if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
-            return [PILineLoginManager applicationOpenurl:app open:url];
-        }
+        return [PILineLoginManager applicationOpenurl:app open:url];
+    }
    
    NSString *text = [url query];
    if(text.length){
@@ -202,8 +215,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
    }
   
    return [GIDSignIn.sharedInstance handleURL:url];
-    
-    
 }


--- a/YuMi/Assets.xcassets/AppIcon.appiconset/1024.png
+++ b/YuMi/Assets.xcassets/AppIcon.appiconset/1024.png
--- a/YuMi/Assets.xcassets/AppIcon.appiconset/1024_副本.png
+++ b/YuMi/Assets.xcassets/AppIcon.appiconset/1024_副本.png
--- a/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png
+++ b/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png
--- a/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
  "images" : [
    {
-      "filename" : "1024.png",
+      "filename" : "1024_副本.png",
      "idiom" : "universal",
      "platform" : "ios",
      "size" : "1024x1024"
--- a/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "crossroom_pk_menu_icon_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "crossroom_pk_menu_icon_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/crossroom_pk_menu_icon_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/crossroom_pk_menu_icon_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/crossroom_pk_menu_icon_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/crossroom_pk_menu_icon_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json
@@ -5,12 +5,11 @@
      "scale" : "1x"
    },
    {
-      "filename" : "home_hour_no_1_ar@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
-      "filename" : "home_hour_no_1_ar@3x.png",
+      "filename" : "图层 2@3x (1).png",
      "idiom" : "universal",
      "scale" : "3x"
    }
--- a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/图层
+++ b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/图层
--- a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json
@@ -5,12 +5,11 @@
      "scale" : "1x"
    },
    {
-      "filename" : "home_week_no_1_ar@2x.png",
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
-      "filename" : "home_week_no_1_ar@3x.png",
+      "filename" : "图层 1@3x (1).png",
      "idiom" : "universal",
      "scale" : "3x"
    }
--- a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/图层
+++ b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/图层
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pk_top_charms_mark_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pk_top_charms_mark_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/pk_top_charms_mark_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/pk_top_charms_mark_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/pk_top_charms_mark_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/pk_top_charms_mark_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pk_top_momey_mark_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pk_top_momey_mark_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/pk_top_momey_mark_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/pk_top_momey_mark_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/pk_top_momey_mark_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/pk_top_momey_mark_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_draw_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_draw_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/room_across_pk_result_top_draw_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/room_across_pk_result_top_draw_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/room_across_pk_result_top_draw_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/room_across_pk_result_top_draw_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_fail_en@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_fail_en@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_fail_ar.imageset/room_across_pk_result_top_fail_en@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_win_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_across_pk_result_top_win_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/room_across_pk_result_top_win_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/room_across_pk_result_top_win_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/room_across_pk_result_top_win_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/room_across_pk_result_top_win_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_pk_panel_result_draw_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_pk_panel_result_draw_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/room_pk_panel_result_draw_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/room_pk_panel_result_draw_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/room_pk_panel_result_draw_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/room_pk_panel_result_draw_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_pk_panel_result_fail_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_pk_panel_result_fail_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/room_pk_panel_result_fail_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/room_pk_panel_result_fail_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/room_pk_panel_result_fail_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/room_pk_panel_result_fail_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_pk_panel_result_win_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_pk_panel_result_win_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/room_pk_panel_result_win_ar@2x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/room_pk_panel_result_win_ar@2x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/room_pk_panel_result_win_ar@3x.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/room_pk_panel_result_win_ar@3x.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_ask_ar.imageset/room_treasure_fairy_ball_ask_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_ask_ar.imageset/room_treasure_fairy_ball_ask_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_not_get_ar.imageset/room_treasure_fairy_ball_not_get_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_not_get_ar.imageset/room_treasure_fairy_ball_not_get_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_send_ar.imageset/room_treasure_fairy_ball_send_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_ball_send_ar.imageset/room_treasure_fairy_ball_send_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_more_bg_ar.imageset/room_treasure_fairy_more_bg_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_more_bg_ar.imageset/room_treasure_fairy_more_bg_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_bg_ar.imageset/room_treasure_fairy_my_bg_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_bg_ar.imageset/room_treasure_fairy_my_bg_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_high_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_normal_ar.imageset/room_treasure_fairy_my_high_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_normal_ar.imageset/room_treasure_fairy_my_high_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_high_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_select_ar.imageset/room_treasure_fairy_my_high_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_high_title_select_ar.imageset/room_treasure_fairy_my_high_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_low_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_normal_ar.imageset/room_treasure_fairy_my_low_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_normal_ar.imageset/room_treasure_fairy_my_low_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_low_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_select_ar.imageset/room_treasure_fairy_my_low_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_low_title_select_ar.imageset/room_treasure_fairy_my_low_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_record_bg_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_record_bg_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_record_bg_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_record_bg_ar.imageset/room_treasure_fairy_my_record_bg_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_record_bg_ar.imageset/room_treasure_fairy_my_record_bg_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_tips_bg_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_tips_bg_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_tips_bg_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_tips_bg_ar.imageset/room_treasure_fairy_my_tips_bg_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_tips_bg_ar.imageset/room_treasure_fairy_my_tips_bg_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_title_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_title_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_my_title_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_title_ar.imageset/room_treasure_fairy_my_title_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_my_title_ar.imageset/room_treasure_fairy_my_title_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_pool_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_normal_ar.imageset/room_treasure_fairy_pool_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_normal_ar.imageset/room_treasure_fairy_pool_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_pool_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_select_ar.imageset/room_treasure_fairy_pool_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_pool_select_ar.imageset/room_treasure_fairy_pool_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_record_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_normal_ar.imageset/room_treasure_fairy_record_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_normal_ar.imageset/room_treasure_fairy_record_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_record_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_select_ar.imageset/room_treasure_fairy_record_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_record_select_ar.imageset/room_treasure_fairy_record_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_result_bg_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_result_bg_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_result_bg_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_result_bg_ar.imageset/room_treasure_fairy_result_bg_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_result_bg_ar.imageset/room_treasure_fairy_result_bg_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_exchange_record_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_normal_ar.imageset/room_treasure_fairy_shoping_exchange_record_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_normal_ar.imageset/room_treasure_fairy_shoping_exchange_record_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_exchange_record_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_select_ar.imageset/room_treasure_fairy_shoping_exchange_record_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_record_title_select_ar.imageset/room_treasure_fairy_shoping_exchange_record_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_exchange_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_normal_ar.imageset/room_treasure_fairy_shoping_exchange_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_normal_ar.imageset/room_treasure_fairy_shoping_exchange_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_exchange_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_select_ar.imageset/room_treasure_fairy_shoping_exchange_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_exchange_title_select_ar.imageset/room_treasure_fairy_shoping_exchange_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summon_record_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_normal_ar.imageset/room_treasure_fairy_shoping_summon_record_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_normal_ar.imageset/room_treasure_fairy_shoping_summon_record_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summon_record_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_select_ar.imageset/room_treasure_fairy_shoping_summon_record_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_record_title_select_ar.imageset/room_treasure_fairy_shoping_summon_record_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summon_title_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_normal_ar.imageset/room_treasure_fairy_shoping_summon_title_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_normal_ar.imageset/room_treasure_fairy_shoping_summon_title_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_select_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_select_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summon_title_select_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_select_ar.imageset/room_treasure_fairy_shoping_summon_title_select_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summon_title_select_ar.imageset/room_treasure_fairy_shoping_summon_title_select_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_disable_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_disable_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summond_disable_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_disable_ar.imageset/room_treasure_fairy_shoping_summond_disable_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_disable_ar.imageset/room_treasure_fairy_shoping_summond_disable_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_high_title_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_high_title_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summond_high_title_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_high_title_ar.imageset/room_treasure_fairy_shoping_summond_high_title_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_high_title_ar.imageset/room_treasure_fairy_shoping_summond_high_title_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_low_title_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_low_title_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summond_low_title_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_low_title_ar.imageset/room_treasure_fairy_shoping_summond_low_title_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_low_title_ar.imageset/room_treasure_fairy_shoping_summond_low_title_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_middle_title_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_middle_title_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summond_middle_title_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_middle_title_ar.imageset/room_treasure_fairy_shoping_summond_middle_title_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_middle_title_ar.imageset/room_treasure_fairy_shoping_summond_middle_title_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_normal_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_normal_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_shoping_summond_normal_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_normal_ar.imageset/room_treasure_fairy_shoping_summond_normal_ar.png
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_shoping_summond_normal_ar.imageset/room_treasure_fairy_shoping_summond_normal_ar.png
--- a/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_store_exper_bg_ar.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/Language/ar/room_treasure_fairy_store_exper_bg_ar.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "room_treasure_fairy_store_exper_bg_ar.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eggmanQQQ	2010befed6	修正 UI 验收问题	2024-07-15 11:17:04 +08:00
eggmanQQQ	bce103c034	修正 UI 反馈	2024-07-12 15:53:11 +08:00
eggmanQQQ	e803011bef	Merge branch 'test/remove_resource' into feature/1.0.14 * test/remove_resource: try remove unused resource try remove unused resource	2024-07-12 14:08:29 +08:00
eggmanQQQ	f573b53ae8	fix ui bugs	2024-07-12 14:07:53 +08:00
eggmanQQQ	3fbb87be6c	Bug fix	2024-07-11 18:57:34 +08:00
eggmanQQQ	0a973ca4d5	修正聊天卡片 UI 修正其他 UI 问题	2024-07-11 13:37:43 +08:00
eggmanQQQ	0d950baaf4	開黑點單 & Bug fix	2024-07-11 10:22:49 +08:00
eggmanQQQ	8ba415a6b5	合并几个需求的内容	2024-07-11 10:22:47 +08:00
eggmanQQQ	ec16e8626c	个人资料页代码整理整理 userinfomodel	2024-07-11 10:20:24 +08:00
eggmanQQQ	d9fe86a3c2	修正 bugs	2024-07-11 10:20:02 +08:00
eggmanQQQ	aee0679353	修正 bugs	2024-07-11 10:19:21 +08:00
eggmanQQQ	acf9430ca8	个人资料页代码整理	2024-07-11 10:16:44 +08:00
eggmanQQQ	af707b8bfd	审核小版本	2024-07-11 10:14:41 +08:00
eggmanQQQ	f10b286101	审核小版本	2024-07-11 10:13:44 +08:00
eggmanQQQ	fb58ff1ec7	開黑點單 & Bug fix	2024-07-11 10:06:33 +08:00
eggmanQQQ	e57895d3e3	调试拉起支付	2024-07-09 15:02:39 +08:00
eggmanQQQ	3dfc5c770e	合并几个需求的内容	2024-07-08 17:06:10 +08:00
eggmanQQQ	cfa67aa4ac	个人资料页代码整理整理 userinfomodel	2024-07-06 17:29:49 +08:00
eggmanQQQ	8adb50763d	#1217 修正 bugs	2024-07-05 11:16:18 +08:00
eggmanQQQ	479638f16e	修正反馈页内容修正个播房公告	2024-07-04 15:46:46 +08:00
eggmanQQQ	5026542a09	#1217 修正 bugs	2024-07-04 15:40:58 +08:00
eggmanQQQ	0544a6b8d0	#1217 新功能：反馈页	2024-07-04 10:18:42 +08:00
eggmanQQQ	1b9c86d66f	#1249 更换新主题色物料	2024-07-02 19:24:43 +08:00
eggmanQQQ	c6169242bd	修正混淆環境容易出錯的部分	2024-06-29 14:26:58 +08:00
eggmanQQQ	6247d009f0	Last update	2024-06-29 14:26:50 +08:00
eggmanQQQ	f43a97205f	更新 Bugly ID	2024-06-29 14:26:44 +08:00
eggmanQQQ	50c98b98de	个人资料页礼物适配大小	2024-06-29 14:26:34 +08:00
eggmanQQQ	0faa0a6739	更正 dev 分支状态	2024-06-27 21:39:39 +08:00
eggmanQQQ	fc92135ce6	完善个人资料页功能完成多麦位 Bug fix	2024-06-27 21:31:00 +08:00
eggmanQQQ	71b7263fd6	完善个人资料页功能	2024-06-25 19:18:51 +08:00
eggmanQQQ	f064fd8d3d	完善个人资料页功能	2024-06-25 17:24:32 +08:00
eggmanQQQ	18f9aca9f8	完善个人资料页-相册/勋章	2024-06-25 15:08:14 +08:00
eggmanQQQ	8026d3376b	Merge branch 'develop_piko' into feature/1.0.10/User_Detail_Page_Update#962 * develop_piko: 更换无 alpha 的 icon 补充部分数组的安全读取修正首页排行榜显示判断修正阿语区布局修正 UI 效果和奇怪的进房bug 更正 icon 和多语言内容	2024-06-24 19:27:17 +08:00
eggmanQQQ	dc7a2688cf	temp save	2024-06-24 19:11:54 +08:00
eggmanQQQ	051861f34f	更换无 alpha 的 icon 补充部分数组的安全读取	2024-06-24 18:56:48 +08:00
eggmanQQQ	b88be57677	修正首页排行榜显示判断	2024-06-24 17:07:56 +08:00
eggmanQQQ	7320401f5d	修正阿语区布局	2024-06-24 16:24:50 +08:00
eggmanQQQ	67253ea1b2	修正 UI 效果和奇怪的进房bug	2024-06-24 15:38:22 +08:00
eggmanQQQ	3bab779261	更正 icon 和多语言内容	2024-06-24 14:29:52 +08:00
eggmanQQQ	fe4c8d5737	Merge branch 'feature/1.0.9/New_Home_Me_Page#916' into feature/1.0.10/User_Detail_Page_Update#962 * feature/1.0.9/New_Home_Me_Page#916: 修正多语言资源名称更新礼物面板 icon size 修正验收问题	2024-06-24 14:23:57 +08:00
eggmanQQQ	6eab9c66c7	修正多语言资源名称	2024-06-24 14:18:08 +08:00
eggmanQQQ	67d3820d60	更新礼物面板 icon size	2024-06-24 14:11:52 +08:00
eggmanQQQ	7a735411e8	调整个人资料页样式	2024-06-24 14:06:31 +08:00
eggmanQQQ	d8333a3ba4	修正验收问题	2024-06-24 13:10:00 +08:00
eggmanQQQ	9ab187415c	调整个人资料页功能和布局删除不使用的功能代码	2024-06-24 08:10:31 +08:00
eggmanQQQ	a646d24d82	Merge branch 'feature/1.0.9/New_Home_Me_Page#916' into feature/1.0.10/User_Detail_Page_Update#962 * feature/1.0.9/New_Home_Me_Page#916: fix some PK ui bugs 修正 UI 效果	2024-06-23 11:04:46 +08:00
eggmanQQQ	5593656092	fix some PK ui bugs (cherry picked from commit `8314ba5c5f`)	2024-06-23 11:04:15 +08:00
eggmanQQQ	8314ba5c5f	fix some PK ui bugs	2024-06-23 11:02:34 +08:00
eggmanQQQ	dcd841a912	修正 UI 效果	2024-06-21 19:14:28 +08:00
eggmanQQQ	93349c3490	#962 移除不必要的页面组件	2024-06-21 18:49:16 +08:00
eggmanQQQ	ac829e6a21	try remove unused resource	2024-06-21 17:47:05 +08:00
eggmanQQQ	679198a976	try remove unused resource	2024-06-21 17:29:47 +08:00
eggmanQQQ	fe688ff275	1. 修正首页我的 tab model 的判断 2. 移除房间信息更新处的热度更新时机	2024-06-21 17:23:33 +08:00
eggmanQQQ	22e54d3d6d	1. 修正 PK 结果文案 2. 调整首页 top tab bar item 下标位置	2024-06-21 16:38:31 +08:00
eggmanQQQ	2d4c030a09	#916 1. bugs fix, 多是 UI 问题，部份是线上问题 2. 要注意更新数据时的保护操作	2024-06-21 16:14:36 +08:00
eggmanQQQ	9af02cd815	#916 1. 补充多语言 2. 调整部分逻辑 & bugs	2024-06-21 12:38:03 +08:00
eggmanQQQ	627748d230	#916 save code	2024-06-21 01:37:38 +08:00
eggmanQQQ	7210bd9d79	房间榜热度增加参数	2024-06-19 16:05:05 +08:00
eggmanQQQ	e88a5feb54	#761 #967 1. 修正 PK UI 问题 2. 完成礼物面板的修改	2024-06-19 15:53:25 +08:00
eggmanQQQ	b122296ae4	try fix bug and remove some error fetch image sources	2024-06-19 15:53:25 +08:00
eggmanQQQ	0aacc05c0a	接入新首页-我的 api	2024-06-19 08:40:14 +08:00
eggmanQQQ	726a6d66f2	#761 修复多语言布局问题	2024-06-19 00:16:13 +08:00
eggmanQQQ	daf1e2d2cd	#916 用 page view controller 来作为新的父组件	2024-06-18 17:38:13 +08:00
eggmanQQQ	9e156c223f	#916 优化代码结构	2024-06-18 14:17:06 +08:00
eggmanQQQ	c4d0b1c33c	移除测试代码	2024-06-18 13:54:54 +08:00
eggmanQQQ	1699ebc926	#761 #770 1. 完善牌照房 PK 功能 2. 补充多语言 3. 修复部分跨房 PK 问题	2024-06-18 13:44:50 +08:00
eggmanQQQ	a9ce6039f8	注释不必要的 API Call	2024-06-17 18:42:14 +08:00
eggmanQQQ	3803718cb1	#761 完成房间 PK 面板基本流程	2024-06-16 16:18:30 +08:00
eggmanQQQ	49d17e1c6f	更换方法名：safeObjectAtIndex1 -> xpSafeObjectAtIndex	2024-06-16 16:18:06 +08:00
eggmanQQQ	384bc3e95c	#761 完成房间 PK 面板基本 UI 结构	2024-06-14 21:04:26 +08:00
eggmanQQQ	c735852d9b	使用全球加速域名	2024-06-14 16:14:16 +08:00
eggmanQQQ	ace1bd9bbe	#761 1. 更新图片资源 2. 修改 PK/跨房PK 入口	2024-06-13 20:18:03 +08:00
eggmanQQQ	d54f70547a	#770 1. 调整跨房 PK 的所有 UI 2. 有部份未使用没有移除资源	2024-06-13 17:52:59 +08:00
eggmanQQQ	0585d1e9e6	项目优化： 1. 优化代码格式 2. 优化冷启动时第三方的加载顺序	2024-06-12 11:23:10 +08:00
eggmanQQQ	2469e186b4	项目优化： 1. 版本号更新 2. Archive 使用 Debug 配置，蒲公英测试包可以切换环境 3. 移除不使用的第三方库“Weex”和对应文件	2024-06-12 10:45:15 +08:00