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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  个人相册
  代码保护
  打包设置
  限时累充
  UI排版
  ui优化

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -5,8 +5,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="width-width,height-height,top-top"/>
     </image>
+    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
     <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
@@ -14,10 +15,9 @@
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
-    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,195" size="987,1724">
+    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
       <relation target="" sidePair="height-height"/>
     </component>
-    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,54"/>
     <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,13 @@
   <displayList>
     <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
-    <list id="n3_mbf1" name="listRewards" xy="99,65" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="93,65" size="662,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
     </list>

FGUIProject/assets/Main/MainUI.xml

@@ -46,8 +46,7 @@
     <group id="n88_ktf2" name="n88" xy="607,162" size="443,132" group="n52_qqat" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
-      <relation target="" sidePair="right-right,top-top"/>
+    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" scrollItemToViewOnClick="false" foldInvisibleItems="true">
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
@@ -63,7 +62,9 @@
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="995,1597" pivot="0.5,0" anchor="true" size="102,117" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true"/>
+    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
     <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>

FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml

@@ -2,7 +2,7 @@
 <component size="448,590">
   <displayList>
     <image id="n48_r9ri" name="n48" src="volsgh" fileName="images/grxc_db.png" xy="0,0"/>
-    <image id="n50_vols" name="n50" src="volsgi" fileName="images/tb_jiahao.png" xy="122,193"/>
+    <image id="n50_vols" name="imgNone" src="volsgi" fileName="images/tb_jiahao.png" xy="122,193"/>
     <component id="n49_r9ri" name="comPhoto" src="r9ri1o" fileName="components/ComPhoto.xml" xy="2,2" size="444,586"/>
     <image id="n55_vols" name="n55" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="202,249" group="n54_vols"/>
     <image id="n51_vols" name="n51" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="13,287" group="n54_vols"/>

FGUIProject/assets/RoleInfo/components/ListPhotoItem1.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="512,740">
   <displayList>
-    <component id="n1_r9ri" name="comIcon" src="r9ri1q" fileName="components/ComIcon.xml" xy="0,0"/>
-    <image id="n2_r9ri" name="n2" src="r9ri1t" fileName="images/xc_kuangdi.png" xy="0,0"/>
-    <text id="n3_r9ri" name="txtTime" xy="88,691" pivot="0.5,0" size="335,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
-    <image id="n4_r9ri" name="imgOtherSelect" src="r9ri1s" fileName="images/xc_xzxd.png" xy="0,0"/>
+    <component id="n1_r9ri" name="comIcon" src="r9ri1q" fileName="components/ComIcon.xml" xy="0,1"/>
+    <image id="n2_r9ri" name="n2" src="r9ri1t" fileName="images/xc_kuangdi.png" xy="0,0" size="512,696"/>
+    <text id="n3_r9ri" name="txtTime" xy="110,691" pivot="0.5,0" size="290,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
+    <image id="n4_r9ri" name="imgOtherSelect" src="r9ri1s" fileName="images/xc_xzxd.png" xy="0,0" size="512,695"/>
     <image id="n5_oqa1" name="imgSelect" src="oqa1g1" fileName="images/xc_qxxzxd.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -62,8 +62,8 @@
     <component id="r9ri1o" name="ComPhoto.xml" path="/components/"/>
     <component id="r9ri1p" name="Button5.xml" path="/components/"/>
     <component id="r9ri1q" name="ComIcon.xml" path="/components/"/>
-    <image id="r9ri1s" name="xc_xzxd.png" path="/images/"/>
-    <image id="r9ri1t" name="xc_kuangdi.png" path="/images/"/>
+    <image id="r9ri1s" name="xc_xzxd.png" path="/images/" scale="9grid" scale9grid="128,173,256,346"/>
+    <image id="r9ri1t" name="xc_kuangdi.png" path="/images/" scale="9grid" scale9grid="128,173,256,346"/>
     <component id="r9ri1v" name="ListPhotoItem1.xml" path="/components/"/>
     <image id="r9ri1w" name="xc_xczi.png" path="/images/"/>
     <image id="r9ri1x" name="hl_sczpxzdik.png" path="/images/" scale="9grid" scale9grid="146,20,292,40"/>

GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -218,5 +218,40 @@ namespace GFGGame
             comLv.m_txtLvl.text = lv > 0 ? lv.ToString() : "--";
             UI_ComHeadLv.ProxyEnd();
         }
+
+        public static string[] GetSuitPosItems()
+        {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege4);
+            string[] posItems = new string[GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
+            for (int i = 0; i < posItems.Length; i++)
+            {
+                posItems[i] = "";
+                if (GetPosType(i) == 0)
+                {
+                    posItems[i] = "";
+                }
+                else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+                {
+                    posItems[i] = "金卡开启";
+                }
+                else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+                {
+                    posItems[i] = "黑金卡开启";
+                }
+            }
+            return posItems;
+        }
+
+        //获取指定位置月卡类型
+        public static int GetPosType(int pos)
+        {
+            if (pos < GlobalCfgArray.globalCfg.freeAlbumNum) return 0;
+
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege4);
+            if (pos < GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0]) return MonthCardType.Gold;
+            if (pos >= GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0]) return MonthCardType.BlackGold;
+
+            return 0;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem.cs

@@ -7,6 +7,7 @@ namespace UI.RoleInfo
     public partial class UI_ListPhotoItem
     {
         public GComponent target;
+        public GImage m_imgNone;
         public UI_ComPhoto m_comPhoto;
         public GTextField m_txtLock;
         public GGroup m_grpLock;
@@ -57,12 +58,14 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_imgNone = (GImage)comp.GetChild("imgNone");
             m_comPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("comPhoto"));
             m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgNone = null;
             m_comPhoto.Dispose();
             m_comPhoto = null;
             m_txtLock = null;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -123,7 +123,7 @@ namespace GFGGame
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
-            int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
+            int[] reward = ((int[][])obj.parent.data)[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
             {

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

@@ -112,9 +112,17 @@ namespace GFGGame
             long pictureId = RoleDataManager.photoDatas[index];
             PoemPhotoData poemPhotoData = pictureId == 0 ? null : PoemPhotoDataManager.Instance.GetPersonalPhotoDataById(pictureId);
             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;
+                return;
+            }
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
-            item.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }
 
@@ -122,6 +130,17 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             int index = (int)obj.data;
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("金卡开启");
+                return;
+            }
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("黑金卡开启");
+                return;
+            }
+
             ViewManager.Show<PersonalPhotoView>(index, new object[] { typeof(RoleInfoView).FullName, this.viewData });
             this.Hide();
         }

GameClient/Assets/link.xml

@@ -3,7 +3,6 @@
 	<assembly fullname="UnityEngine.SpriteMaskModule">
 		<type fullname="UnityEngine.SpriteMask" preserve="all" />
 	</assembly>
-	<assembly fullname="UnityEngine.CoreModule">
-		<type fullname="UnityEngine.Rendering.SortingGroup" preserve="all" />
+	<assembly fullname="UnityEngine.CoreModule" preserve="all">
 	</assembly>
 </linker>

GameClient/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: gfg
-  productName: "\u4E07\u4E16\u955C_zy"
+  productName: "\u4E07\u4E16\u955C"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shenyou.gfg.zy
+    Android: com.shenyou.gfg.local
     Standalone: com.DefaultCompany.GFGClient
   buildNumber:
     Standalone: 0
@@ -699,7 +699,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    7: ILRuntime1;PT_DEV111;PT_TEMP111
+    7: 
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: