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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  查看他人相册

FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -3,7 +3,7 @@
   <displayList>
     <loader id="n0_r9ri" name="bg" xy="0,0" size="960,665" touchable="false" url="ui://374k3dwvr9riw" autoSize="true"/>
     <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
-    <text id="n15_oqa1" name="n15" xy="432,87" size="95,62" group="n16_oqa1" fontSize="46" color="#a98151" text="设置"/>
+    <text id="n15_oqa1" name="n15" xy="432,87" size="95,61" group="n16_oqa1" fontSize="46" color="#a98151" text="设置"/>
     <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
     <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="511,488" aspect="true">
       <Button title="注销账户"/>
@@ -12,10 +12,14 @@
       <Button title="返回登录"/>
     </component>
     <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" fontSize="42" color="#c58c88" text="音乐"/>
-    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri"/>
+    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri">
+      <Button checked="true"/>
+    </component>
     <group id="n12_r9ri" name="n12" xy="144,273" size="244,61"/>
     <text id="n5_r9ri" name="n5" xy="572,272" size="87,56" group="n11_r9ri" fontSize="42" color="#c58c88" text="音效"/>
-    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri"/>
+    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri">
+      <Button checked="true"/>
+    </component>
     <group id="n11_r9ri" name="n11" xy="572,272" size="243,59"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -95,9 +95,20 @@ namespace GFGGame
         {
             PoemPhotoData poemPhotoData = _roleDetailInfo.showPhotoList[index];
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
+            item.target.data = index;
+
+            item.m_imgNone.visible = poemPhotoData == null;
+            item.m_grpLock.visible = false;
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
+            || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                item.m_grpLock.visible = true;
+                item.m_comPhoto.m_loaPhoto.texture = null;
+                item.m_imgNone.visible = false;
+                return;
+            }
 
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
-            item.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -120,6 +120,8 @@ namespace GFGGame
             || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
                 item.m_grpLock.visible = true;
+                item.m_comPhoto.m_loaPhoto.texture = null;
+                item.m_imgNone.visible = false;
                 return;
             }
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;