Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/ResIn/Prefab/Role.prefab

@@ -102,7 +102,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 18970103aa1e4ba45a0c38d5f7cf7d34, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -110,6 +110,6 @@ SpriteRenderer:
   m_Size: {x: 6.17, y: 13.35}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0

GameClient/Assets/ResIn/Prefab/SceneDressUp.prefab

@@ -15,6 +15,18 @@ PrefabInstance:
       propertyPath: m_WasSpriteAssigned
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6789252972580790849, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Size.x
+      value: 6.18
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252972580790849, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252972580790849, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6789252974363538596, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_Name
       value: SceneDressUp