Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

FGUIProject/assets/DressUp/components/Button12.xml

@@ -4,6 +4,6 @@
   <displayList>
     <loader id="n3_i3ix" name="icon" xy="0,0" size="84,84" url="ui://mbo439wbxmtl4x" autoSize="true"/>
   </displayList>
-  <Button mode="Radio"/>
+  <Button/>
   <relation target="n3_i3ix" sidePair="width-width,height-height"/>
 </component>

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -47,9 +47,9 @@ namespace GFGGame
         {
             base.OnHide();
             _ui.m_btnSave.selected = false;
-            _ui.m_btnSave.touchable = true;
+            _ui.m_btnSave.enabled = true;
             _ui.m_btnSavePhoto.selected = false;
-            _ui.m_btnSavePhoto.touchable = true;
+            _ui.m_btnSavePhoto.enabled = true;
             Timers.inst.Remove(CheckGuide);
         }
 
@@ -91,8 +91,11 @@ namespace GFGGame
                 };
                 Permission.RequestUserPermission(Permission.ExternalStorageWrite, permissionCallbacks);
             }
-            LocalCache.SetBool(GameConst.WRITE_EXTERNAL_STORAGE_FORBIDDEN, false);
-            TrySavePicturoToLocal();
+            else
+            {
+                LocalCache.SetBool(GameConst.WRITE_EXTERNAL_STORAGE_FORBIDDEN, false);
+                TrySavePicturoToLocal();
+            }
         }
 
         private void TrySavePicturoToLocal()
@@ -101,7 +104,7 @@ namespace GFGGame
             {
                 string fileName = "wsj" + TimeHelper.ServerNowSecs + ".jpg";
                 PhotographUtil.Instance.SavePicturoToLocal(bytes, fileName);
-                _ui.m_btnSave.touchable = false;
+                _ui.m_btnSave.enabled = false;
             }
         }
 
@@ -140,7 +143,7 @@ namespace GFGGame
                 }
             }
 
-            _ui.m_btnSavePhoto.touchable = false;
+            _ui.m_btnSavePhoto.enabled = false;
 
         }