IOS合并master代码后修复bug

GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

GameClient/Assets/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher.png.meta
-guid: e6023d29d3fefd14f9c937a906bf7dfb
-=======
 guid: 0dd2027a6278544d4acc46c208b9f5f5
->>>>>>> remotes/origin/master:GameClient/Assets/ThirdParty/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef

@@ -9,7 +9,10 @@
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:d9a5d47c553a04a28a7d21a3f3fc8dc3",
         "GUID:9b1c19877f4294a9cb33ff38fc9f1c83",
-        "GUID:f22fac247a56d2d41b687bb0d900e54e"
+        "GUID:f22fac247a56d2d41b687bb0d900e54e",
+        "GUID:60bfecf5cb232594891bc622f40d6bed",
+        "GUID:08d1c582746949b40ba6a45cdb776bdf",
+        "GUID:98c047f00cf7d4cbb8028bf242da48b5"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],