合并develop代码

@@ -173,8 +173,8 @@ $clothes: sprite-map("guang/clothes/*.png");
         position: absolute;
         position: absolute;
         right: 6rem / $pxConvertRem;
         right: 6rem / $pxConvertRem;
         bottom: 34rem / $pxConvertRem;
         bottom: 34rem / $pxConvertRem;
-        width: 36px;
-        height: 36px;
+        width: 20px;
+        height: 20px;
         @include border-radius(50%); 
         @include border-radius(50%); 
         
         
         &.bag {
         &.bag {