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

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1300">
+<component size="1080,1639">
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-600" size="1080,2228"/>
     <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
     <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
     </loader>
     <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
-    <list id="n0_r1a9" name="listCard" xy="84,415" size="912,657" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
+      <Button title="提升词牌"/>
+    </component>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
+    <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n0_r1a9" name="listCard" xy="41,415" size="998,961" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -18,25 +33,18 @@
       <item/>
       <item/>
       <item/>
-    </list>
-    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1113" group="n12_ofwu">
-      <Button title="取消"/>
-    </component>
-    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1113" group="n12_ofwu">
-      <Button title="确认"/>
-    </component>
-    <group id="n12_ofwu" name="n12" xy="129,1113" size="822,105"/>
-    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
-      <Button title="提升词牌"/>
-    </component>
-    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
-    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
-    <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
     <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,316" visible="false"/>
+    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="30,1270"/>
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1435" group="n12_ofwu">
+      <Button title="取消"/>
+    </component>
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1435" group="n12_ofwu">
+      <Button title="确认"/>
+    </component>
+    <group id="n12_ofwu" name="n12" xy="129,1435" size="822,105"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComCardMask.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="212,224" overflow="hidden" mask="n6_wzce" reversedMask="true">
+<component size="238,437" overflow="hidden">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n4_r1a9" name="loaCard" xy="3,-50" pivot="0.5,0.5" size="210,388" url="ui://7l6lvkayr9ri9x" fill="scaleMatchWidth"/>
-    <image id="n6_wzce" name="n6" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,-1"/>
+    <loader id="n7_ebfi" name="loaCard" xy="2,2" size="234,432" fill="scaleFree"/>
+    <image id="n8_ebfi" name="n8" src="ebfips" fileName="images/kp_dikuang_2.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="220,279" extention="Button">
+<component size="242,492" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="4,3" group="n23_ofwu"/>
-    <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="5,156" group="n23_ofwu"/>
-    <text id="n3_r1a9" name="txtName" xy="57,236" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" text="赵钱孙"/>
-    <text id="n12_wzce" name="txtLv" xy="153,192" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
-    <text id="n18_v461" name="txtStarLv" xy="152,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="177,177" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="152,173" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
+    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="2,3" group="n23_ofwu"/>
+    <text id="n3_r1a9" name="txtName" xy="68,446" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" text="赵钱孙"/>
+    <image id="n24_ebfi" name="n24" src="ebfipt" fileName="images/kp_dikuang_1.png" xy="2,341" group="n23_ofwu"/>
+    <text id="n18_v461" name="txtStarLv" xy="177,370" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="202,374" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="177,370" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <loader id="n7_sx2v" name="loaRarity" xy="168,13" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
-    <loader id="n16_qr4e" name="loaMainScore" xy="13,13" size="46,46" group="n23_ofwu" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
-    <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="3,2" group="n23_ofwu"/>
-    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="220,235" group="n23_ofwu" url="ui://eg2y0ldp94m19v" fill="scaleFree"/>
-    <graph id="n13_dcro" name="holder" xy="110,115" size="1,1" group="n23_ofwu" touchable="false" type="rect">
-      <gearDisplay controller="button" pages="1"/>
-    </graph>
-    <group id="n23_ofwu" name="n23" xy="0,0" size="220,282"/>
+    <text id="n12_wzce" name="txtLv" xy="177,395" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
+    <loader id="n7_sx2v" name="loaRarity" xy="187,17" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="19,19" size="46,46" group="n23_ofwu" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
+    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="242,441" group="n23_ofwu" url="ui://eg2y0ldp94m19t" fill="scaleFree" autoSize="true"/>
+    <group id="n23_ofwu" name="n23" xy="0,0" size="242,492"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -207,7 +207,7 @@
     <component id="py009o" name="ComSkillCard.xml" path="/components/"/>
     <component id="sx2v9p" name="ComSkillName.xml" path="/components/"/>
     <image id="sx2v9q" name="zd_tctcxian_2.png" path="/imagesStory/"/>
-    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/"/>
+    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/" scale="9grid" scale9grid="270,0,540,66"/>
     <image id="sx2v9s" name="zd_tctcdikugn_1.png" path="/imagesStory/"/>
     <image id="sx2v9t" name="zd_tctcdikugn_2.png" path="/imagesStory/" scale="9grid" scale9grid="54,58,108,116"/>
     <image id="sx2v9u" name="zd_tctcxian_1.png" path="/imagesStory/"/>
@@ -667,6 +667,9 @@
     <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
     <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>
     <image id="jx6zpq" name="zs_flower.png" path="/imagesNew/"/>
+    <image id="ebfipr" name="zd_tctcdi_1_zz.png" path="/imagesStory/"/>
+    <image id="ebfips" name="kp_dikuang_2.png" path="/images/"/>
+    <image id="ebfipt" name="kp_dikuang_1.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="每日任务"/>
     <remark page="1" value="织造任务"/>
   </controller>
@@ -22,20 +22,20 @@
       <item/>
     </list>
     <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
-    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每天5:00刷新">
+    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="周一5:00刷新">
       <gearText controller="c1" pages="0" values="每天5:00刷新" default="周一5:00刷新"/>
     </text>
     <image id="n17_ids4" name="n17" src="uxxstm8" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
     <component id="n25_ids4" name="btnDailyTask" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
-      <Button checked="true" controller="c1" page="0"/>
+      <Button controller="c1" page="0"/>
     </component>
     <component id="n26_ids4" name="btnBattlePassTask" src="ids44e" fileName="components/TabButton.xml" xy="555,805" group="n27_ids4">
-      <Button title="织造任务" controller="c1" page="1"/>
+      <Button checked="true" title="织造任务" controller="c1" page="1"/>
     </component>
     <group id="n27_ids4" name="n27" xy="294,805" size="522,72" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n18_ids4" name="GetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="405,1779" size="273,59">
+    <component id="n30_ebfi" name="GetAll" src="jx6ztod" fileName="components/Button14.xml" pkg="eg2y0ldp" xy="403,1785">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button title="一键领取" titleColor="#915e15"/>
+      <Button title="一键领取"/>
     </component>
   </displayList>
 </component>

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

@@ -53,8 +53,9 @@ namespace GFGGame
 
             string layerName = string.Format("resLayer{0}", layer);
             string value = typeof(ItemCfg).GetField(layerName).GetValue(itemCfg).ToString();
-            string res = value == "n" ? itemCfg.res : string.Format("{0}_{1}", itemCfg.res, value);
+            // string res = value == "n" ? itemCfg.res : string.Format("{0}_{1}", itemCfg.res, value);
 
+            string res = DressUpUtil.GetDressUpItemLayerRes(itemCfg, layer);
             string resPath = ResPathUtil.GetDressUpPath(res);
             var effPath = ResPathUtil.GetDressUpEffectPath(itemCfg.res);
             if (!VEngine.Versions.Contains(resPath) && VEngine.Versions.Contains(effPath))
@@ -96,7 +97,8 @@ namespace GFGGame
 
             GameObject gameObject = new GameObject(itemCfg.id.ToString());
             gameObject.transform.SetParent(parentGameObj.transform);
-            string resPath = ResPathUtil.GetDressUpPath(itemCfg.res);
+            string res = DressUpUtil.GetDressUpItemLayerRes(itemCfg, resLayer);
+            string resPath = ResPathUtil.GetDressUpPath(res);
             SetSpriteRendererToTransform(gameObject.transform, resPath);
             SetBoxCollider2DToGameObject(gameObject);
             gameObject.GetComponent<SpriteRenderer>().enabled = false;
@@ -135,6 +137,7 @@ namespace GFGGame
             }
             DressUpUtil.ChangeAssetReleaser(tf.gameObject, resPath);
             Sprite sp = GFGAsset.Load<Sprite>(resPath);
+            if (sp == null) return;
             spr.sprite = sp;
             spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
 

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

@@ -53,7 +53,7 @@ namespace GFGGame
             foreach (Transform t in parent)
             {
                 string[] strs = t.name.Split('_');
-                if (strs.Length > 1 && strs[1] == "eff") continue;//不计算特效大小
+                if (strs.Length > 1 && strs[1].IndexOf("e") >= 0) continue;//不计算特效大小
                 BoxCollider2D render = t.GetComponent<BoxCollider2D>();
                 if (render)
                 {
@@ -61,12 +61,12 @@ namespace GFGGame
                     center += render.bounds.center;
                 }
             }
-            center /= index;
+            if (index > 0) center /= index;
             Bounds bounds = new Bounds(center, Vector3.zero);
             foreach (Transform t in parent)
             {
                 string[] strs = t.name.Split('_');
-                if (strs.Length > 1 && strs[1] == "eff") continue;
+                if (strs.Length > 1 && strs[1].IndexOf("e") >= 0) continue;
                 BoxCollider2D render = t.GetComponent<BoxCollider2D>();
                 if (render) bounds.Encapsulate(render.bounds);
             }
@@ -78,7 +78,7 @@ namespace GFGGame
             foreach (Transform t in parent)
             {
                 string[] strs = t.parent.name.Split('_');
-                if (strs.Length > 1 && strs[1] == "eff") continue;
+                if (strs.Length > 1 && strs[1].IndexOf("e") >= 0) continue;
                 t.position = t.position - bounds.center;
             }
 
@@ -120,6 +120,7 @@ namespace GFGGame
             if (state != "refresh")
             {
                 int index = itemGameObjs.IndexOf(hitGameObj);
+                if (index == itemGameObjs.Count - 1 && state == "top") return;
                 if (state != "top")
                 {
                     if (index < 0)
@@ -208,7 +209,7 @@ namespace GFGGame
             {
                 Transform tf = parentObj.transform.GetChild(i);
                 string[] strs = tf.name.Split('_');
-                if (strs.Length > 1 && strs[1] == "eff")//子物体是特效
+                if (strs.Length > 1 && strs[1].IndexOf("e") >= 0)//子物体是特效
                 {
                     DressUpUtil.SetRenderersOrder(tf.gameObject, changeLayer, true);
                 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs

@@ -9,12 +9,11 @@ namespace UI.Main
         public GButton target;
         public UI_ComCardMask m_comCardMask;
         public GTextField m_txtName;
-        public GTextField m_txtLv;
         public GTextField m_txtStarLv;
+        public GTextField m_txtLv;
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
         public GLoader m_loaBorder;
-        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -64,24 +63,22 @@ namespace UI.Main
         {
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
-            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comCardMask.Dispose();
             m_comCardMask = null;
             m_txtName = null;
-            m_txtLv = null;
             m_txtStarLv = null;
+            m_txtLv = null;
             m_loaRarity = null;
             m_loaMainScore = null;
             m_loaBorder = null;
-            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs

@@ -9,13 +9,13 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaScore;
         public GTextField m_txtName;
-        public GList m_listCard;
-        public GButton m_btnCancel;
-        public GButton m_btnConfirm;
         public GButton m_btnUpCard;
-        public GList m_listSkill;
         public GTextField m_txtTips;
+        public GList m_listSkill;
+        public GList m_listCard;
         public UI_ComArenaSkillTips m_comSkillTips;
+        public GButton m_btnCancel;
+        public GButton m_btnConfirm;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -65,26 +65,26 @@ namespace UI.Main
         {
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_listCard = (GList)comp.GetChild("listCard");
-            m_btnCancel = (GButton)comp.GetChild("btnCancel");
-            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
-            m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_listSkill = (GList)comp.GetChild("listSkill");
+            m_listCard = (GList)comp.GetChild("listCard");
             m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaScore = null;
             m_txtName = null;
-            m_listCard = null;
-            m_btnCancel = null;
-            m_btnConfirm = null;
             m_btnUpCard = null;
-            m_listSkill = null;
             m_txtTips = null;
+            m_listSkill = null;
+            m_listCard = null;
             m_comSkillTips.Dispose();
             m_comSkillTips = null;
+            m_btnCancel = null;
+            m_btnConfirm = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -145,9 +145,9 @@ namespace GFGGame
                 string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
                 GameObject gameObject0;
                 GoWrapper wrapper0;
-                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
-                _effects.Add(gameObject0);
-                _wrappers.Add(wrapper0);
+                // SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
+                // _effects.Add(gameObject0);
+                // _wrappers.Add(wrapper0);
             }
             UI_ListCardItem.ProxyEnd();
             // UI_ComStar.ProxyEnd();