Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
   <displayList>
-    <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1920"/>
+    <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
+      <relation target="" sidePair="height-height"/>
+    </loader>
+    <loader id="n11_o139" name="loaGuide" xy="128,114" size="783,972"/>
+    <loader id="n12_o139" name="loaGuide1" xy="135,185" size="783,1397"/>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="919,650">

FGUIProject/assets/DressUp/components/Component2.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,139" overflow="scroll" scroll="horizontal">
-  <controller name="c1" pages="1,,2,,3,,4,,5," selected="1"/>
+  <controller name="c1" pages="1,,2,,3,,4,,5," selected="0"/>
   <displayList>
-    <component id="n9_7dea" name="n9" src="7dea4c" fileName="components/Button7.xml" xy="-8,0" size="265,139" group="n14_7dea">
-      <Button icon="ui://mbo439wbxmtl4p" controller="c1" page="1"/>
+    <component id="n9_7dea" name="btn0" src="7dea4c" fileName="components/Button7.xml" xy="-8,0" size="265,139" group="n14_7dea">
+      <Button checked="true" icon="ui://mbo439wbxmtl4p" controller="c1" page="1"/>
     </component>
-    <component id="n10_7dea" name="n10" src="7dea4c" fileName="components/Button7.xml" xy="257,0" size="265,139" group="n14_7dea">
-      <Button checked="true" icon="ui://mbo439wbxmtl4o" controller="c1" page="2"/>
+    <component id="n10_7dea" name="btn1" src="7dea4c" fileName="components/Button7.xml" xy="257,0" size="265,139" group="n14_7dea">
+      <Button icon="ui://mbo439wbxmtl4o" controller="c1" page="2"/>
     </component>
-    <component id="n11_7dea" name="n11" src="7dea4c" fileName="components/Button7.xml" xy="522,0" size="265,139" group="n14_7dea">
-      <Button checked="true" icon="ui://mbo439wbxmtl4n" controller="c1" page="3"/>
+    <component id="n11_7dea" name="btn2" src="7dea4c" fileName="components/Button7.xml" xy="522,0" size="265,139" group="n14_7dea">
+      <Button icon="ui://mbo439wbxmtl4n" controller="c1" page="3"/>
     </component>
-    <component id="n12_7dea" name="n12" src="7dea4c" fileName="components/Button7.xml" xy="787,0" size="265,139" group="n14_7dea">
+    <component id="n12_7dea" name="btn3" src="7dea4c" fileName="components/Button7.xml" xy="787,0" size="265,139" group="n14_7dea">
       <Button icon="ui://mbo439wbxmtl54" controller="c1" page="4"/>
     </component>
-    <component id="n13_7dea" name="n13" src="7dea4c" fileName="components/Button7.xml" xy="1052,0" size="265,139" group="n14_7dea">
+    <component id="n13_7dea" name="btn4" src="7dea4c" fileName="components/Button7.xml" xy="1052,0" size="265,139" group="n14_7dea">
       <Button icon="ui://mbo439wbxmtl55" controller="c1" page="5"/>
     </component>
     <group id="n14_7dea" name="n14" xy="-8,0" size="1325,139" advanced="true" layout="hz" excludeInvisibles="true"/>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldphinb1" autoSize="true">
+    <loader id="n0_l5nz" name="bg" xy="0,-120" size="1080,2400" url="ui://drx9d1uso1391h" autoSize="true">
+      <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="72,76" visible="false"/>
@@ -22,29 +23,47 @@
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="421,704" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="531,861" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="827,917" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="601,1099" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="382,665" size="484,473" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="185,406" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="505,236" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="909,709" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="199,1085" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="295,1244" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="906,1257" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="177,1435" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="733,1559" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="384,1648" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="138,197" size="810,1490" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
+      <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="632,306" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="259,614" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="713,1032" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="741,663" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="220,267" size="560,804" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="887,59" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="716,365" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="301,345" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="205,675" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="634,1010" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1278" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1483" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1812" group="n25_iakb"/>
+    <component id="n43_o139" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="198,1247" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="159,20" size="767,1831" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
+      <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="272,1189" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="336,887" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="797,1161" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="664,681" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="233,642" size="603,586" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="956,417" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="908,666" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="143,784" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="338,1165" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="638,1170" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="599,1512" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="771,1748" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="930,1503" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="579,656" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="104,378" size="891,1409" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
+      <relation target="" sidePair="left-center,top-middle"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/package.xml

@@ -44,6 +44,9 @@
     <image id="ly9g1d" name="cj_xhua.png" path="/images/"/>
     <component id="ly9g1e" name="Button5.xml" path="/components/"/>
     <image id="eshh1f" name="cj_bj_4.jpg" path="/images/" exported="true" atlas="alone_npot"/>
+    <image id="o1391g" name="cj_tp_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="o1391h" name="cj_tp_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -592,7 +592,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 5))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "拍照功能开启了，点击返回主界面", 0);
+                ShowGuide(target, false, "拍照功能已开启，解锁更多搭配和玩法哦，点这里看看吧", 0);
                 return true;
             }
             return false;
@@ -604,73 +604,59 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 5))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "点击进入自由换装", 0);
+                ShowGuide(target, false, "点击自由换装", 0);
                 return true;
             }
             return false;
         }
-        public static bool TryGuideDressUpViewMenuType2(GList list)
+        public static bool TryGuideDressUpViewMenuType2(GObject target)
         {
-            if (GuideDataManager.currentGuideId == ConstGuideId.PHOTOGRAPH_GUIDE)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+               && StoryDataManager.CheckLevelPass(2, 4)
+               && !StoryDataManager.CheckLevelPass(2, 5))
             {
-                int len = list.numChildren;
-                list.ScrollToView(len - 1);
-                for (int i = 0; i < len; i++)
-                {
-                    UI_comListType item = UI_comListType.Proxy(list.GetChildAt(i));
-                    if (item != null)
-                    {
-                        int menuID = (int)item.target.data;
-                        DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (dressUpMenuItemCfg1.type == ConstDressUpItemType.TAO_ZHUANG)
-                        {
-                            ShowGuide(item.target, true, "点击套装");
-                            return true;
-                        }
-                    }
-                }
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "点击拍照", 0);
+                return true;
             }
             return false;
         }
-        public static void TryGuideDressUpViewMenuPart1(GList list)
+        public static void TryGuideDressUpViewMenuPart1(GObject target)
         {
-            if (GuideDataManager.currentGuideId == ConstGuideId.PHOTOGRAPH_GUIDE)
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
             {
-                if (list.numChildren > 0)
-                {
-                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.target, true, "选择一套衣服换上");
-                        return;
-                    }
-                }
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "可以自由添加已有道具", 0);
             }
         }
-        public static bool TryGuideOpenPhotographView(GObject target)
+        public static bool TryGuideBtnPhotograph(GObject target)
         {
             if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
                 && StoryDataManager.CheckLevelPass(2, 4)
                 && !StoryDataManager.CheckLevelPass(2, 5))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "换好衣服去试着拍张照片吧", 0);
+                ShowGuide(target, false, "点击空白处查看整体效果", 0);
                 return true;
             }
             return false;
         }
-        public static bool TryGuideBtnPhotograph(GObject target)
+        public static bool TryGuideOpenPhotographView(GObject target)
         {
             if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
                 && StoryDataManager.CheckLevelPass(2, 4)
                 && !StoryDataManager.CheckLevelPass(2, 5))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "摆好姿势可以拍照了", 0);
+                ShowGuide(target, false, "双指可控制放大缩小，或点击边框上的按键控制", 0);
                 return true;
             }
             return false;
         }
+
         public static bool TryGuideBtnSave(GObject target)
         {
 
@@ -679,7 +665,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 5))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "拍照的照片记得保存到手机相册哦", 0);
+                ShowGuide(target, false, "点击拍照，可以记录和分享美照啦~", 0);
                 return true;
             }
             return false;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_Component2.cs

@@ -8,6 +8,11 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
+        public GButton m_btn0;
+        public GButton m_btn1;
+        public GButton m_btn2;
+        public GButton m_btn3;
+        public GButton m_btn4;
         public const string URL = "ui://mbo439wbxmtl56";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "Component2";
@@ -56,10 +61,20 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btn0 = (GButton)comp.GetChild("btn0");
+            m_btn1 = (GButton)comp.GetChild("btn1");
+            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_btn3 = (GButton)comp.GetChild("btn3");
+            m_btn4 = (GButton)comp.GetChild("btn4");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btn0 = null;
+            m_btn1 = null;
+            m_btn2 = null;
+            m_btn3 = null;
+            m_btn4 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -8,6 +8,8 @@ namespace UI.DressUp
     {
         public GComponent target;
         public GLoader m_btnBg;
+        public GLoader m_loaGuide;
+        public GLoader m_loaGuide1;
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
         public GButton m_btnPhotograph;
@@ -61,6 +63,8 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_btnBg = (GLoader)comp.GetChild("btnBg");
+            m_loaGuide = (GLoader)comp.GetChild("loaGuide");
+            m_loaGuide1 = (GLoader)comp.GetChild("loaGuide1");
             m_comSelectBox = (UI_ComChecked)UI_ComChecked.Create(comp.GetChild("comSelectBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnPhotograph = (GButton)comp.GetChild("btnPhotograph");
@@ -70,6 +74,8 @@ namespace UI.DressUp
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBg = null;
+            m_loaGuide = null;
+            m_loaGuide1 = null;
             m_comSelectBox.Dispose();
             m_comSelectBox = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -18,16 +18,31 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_0_1;
         public UI_ComStar m_comStar1_0_2;
         public UI_ComStar m_comStar1_0_3;
+        public UI_ComStar m_comStar1_0_4;
+        public UI_ComStar m_comStar1_0_5;
+        public UI_ComStar m_comStar1_0_6;
+        public UI_ComStar m_comStar1_0_7;
+        public UI_ComStar m_comStar1_0_8;
         public GGroup m_grpComStar0;
         public UI_ComStar m_comStar1_1_0;
         public UI_ComStar m_comStar1_1_1;
         public UI_ComStar m_comStar1_1_2;
         public UI_ComStar m_comStar1_1_3;
+        public UI_ComStar m_comStar1_1_4;
+        public UI_ComStar m_comStar1_1_5;
+        public UI_ComStar m_comStar1_1_6;
+        public UI_ComStar m_comStar1_1_7;
+        public UI_ComStar m_comStar1_1_8;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
         public UI_ComStar m_comStar1_2_2;
         public UI_ComStar m_comStar1_2_3;
+        public UI_ComStar m_comStar1_2_4;
+        public UI_ComStar m_comStar1_2_5;
+        public UI_ComStar m_comStar1_2_6;
+        public UI_ComStar m_comStar1_2_7;
+        public UI_ComStar m_comStar1_2_8;
         public GGroup m_grpComStar2;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -87,16 +102,31 @@ namespace UI.LuckyBox
             m_comStar1_0_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_1"));
             m_comStar1_0_2 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_2"));
             m_comStar1_0_3 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_3"));
+            m_comStar1_0_4 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_4"));
+            m_comStar1_0_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_5"));
+            m_comStar1_0_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_6"));
+            m_comStar1_0_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_7"));
+            m_comStar1_0_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_0_8"));
             m_grpComStar0 = (GGroup)comp.GetChild("grpComStar0");
             m_comStar1_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_0"));
             m_comStar1_1_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_1"));
             m_comStar1_1_2 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_2"));
             m_comStar1_1_3 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_3"));
+            m_comStar1_1_4 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_4"));
+            m_comStar1_1_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_5"));
+            m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
+            m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
+            m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
             m_comStar1_2_2 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_2"));
             m_comStar1_2_3 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_3"));
+            m_comStar1_2_4 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_4"));
+            m_comStar1_2_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_5"));
+            m_comStar1_2_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_6"));
+            m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
+            m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
         }
         public void Dispose(bool disposeTarget = false)
@@ -119,6 +149,16 @@ namespace UI.LuckyBox
             m_comStar1_0_2 = null;
             m_comStar1_0_3.Dispose();
             m_comStar1_0_3 = null;
+            m_comStar1_0_4.Dispose();
+            m_comStar1_0_4 = null;
+            m_comStar1_0_5.Dispose();
+            m_comStar1_0_5 = null;
+            m_comStar1_0_6.Dispose();
+            m_comStar1_0_6 = null;
+            m_comStar1_0_7.Dispose();
+            m_comStar1_0_7 = null;
+            m_comStar1_0_8.Dispose();
+            m_comStar1_0_8 = null;
             m_grpComStar0 = null;
             m_comStar1_1_0.Dispose();
             m_comStar1_1_0 = null;
@@ -128,6 +168,16 @@ namespace UI.LuckyBox
             m_comStar1_1_2 = null;
             m_comStar1_1_3.Dispose();
             m_comStar1_1_3 = null;
+            m_comStar1_1_4.Dispose();
+            m_comStar1_1_4 = null;
+            m_comStar1_1_5.Dispose();
+            m_comStar1_1_5 = null;
+            m_comStar1_1_6.Dispose();
+            m_comStar1_1_6 = null;
+            m_comStar1_1_7.Dispose();
+            m_comStar1_1_7 = null;
+            m_comStar1_1_8.Dispose();
+            m_comStar1_1_8 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;
@@ -137,6 +187,16 @@ namespace UI.LuckyBox
             m_comStar1_2_2 = null;
             m_comStar1_2_3.Dispose();
             m_comStar1_2_3 = null;
+            m_comStar1_2_4.Dispose();
+            m_comStar1_2_4 = null;
+            m_comStar1_2_5.Dispose();
+            m_comStar1_2_5 = null;
+            m_comStar1_2_6.Dispose();
+            m_comStar1_2_6 = null;
+            m_comStar1_2_7.Dispose();
+            m_comStar1_2_7 = null;
+            m_comStar1_2_8.Dispose();
+            m_comStar1_2_8 = null;
             m_grpComStar2 = null;
             if(disposeTarget && target != null)
             {

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

@@ -97,7 +97,7 @@ namespace GFGGame
             _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
             EquipDataCache.cacher.PutOnCurrentSuitSaved();
             GuideController.TryGuideDressUpViewMenuType1(_ui.m_comListType1.m_listType);
-            GuideController.TryGuideDressUpViewMenuType2(_ui.m_comListType1.m_listType);
+            GuideController.TryGuideDressUpViewMenuType2(_ui.m_btnPhoto);
         }
 
         protected override void OnHide()
@@ -152,7 +152,6 @@ namespace GFGGame
             {
                 this.showListParts(item1.type);
                 GuideController.TryGuideDressUpViewMenuPart(_ui.m_partsList.m_list);
-                GuideController.TryGuideDressUpViewMenuPart1(_ui.m_partsList.m_list);
             }
             this.hideListType1();
         }
@@ -170,7 +169,6 @@ namespace GFGGame
         private void OnClickPartsListItem(EventContext context)
         {
             GuideController.TryGuideByGuideId(_ui.m_btnSave, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "搭配好的服饰，可以保存随时查看");
-            GuideController.TryGuideOpenPhotographView(_ui.m_btnPhoto);
             GObject listItem = (GObject)context.data as GObject;
             int id = (int)listItem.data;
             if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)

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

@@ -66,6 +66,8 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
+            _ui.m_loaGuide.onClick.Add(OnClickLoaGuide);
+            _ui.m_loaGuide1.onClick.Add(OnClickLoaGuide1);
             _ui.m_btnChoose.onClick.Add(SetUIView);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
@@ -118,13 +120,25 @@ namespace GFGGame
             UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             UpdateBody();
             UpdateScene();
-            GuideController.TryGuideBtnPhotograph(_ui.m_btnPhotograph);
+            GuideController.TryGuideDressUpViewMenuPart1(_ui.m_ComSelectRes.m_comBtnTab.m_btn2);
+            // GuideController.TryGuideBtnPhotograph(_ui.m_btnPhotograph);
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0)
+            {
+                _ui.m_loaGuide.enabled = false;
+                _ui.m_loaGuide1.enabled = false;
+            }
+            else
+            {
+                _ui.m_loaGuide.enabled = true;
+                _ui.m_loaGuide1.enabled = false;
+            }
         }
         /************************************************************UI界面*********************************************************/
         private void OnContorllerChanged(EventContext context)
         {
             int index = _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex;
             RefreshList((EnumPhotographType)index);
+            GuideController.TryGuideBtnPhotograph(_ui.m_loaGuide);
         }
         private void RefreshList(EnumPhotographType index)
         {
@@ -188,7 +202,6 @@ namespace GFGGame
         private void OnTouchUIBegin(EventContext context)
         {
             context.CaptureTouch();
-
             if (_ui.m_ComSelectRes.target.visible == true) return;//添加道具不监听场景点击
             if (Stage.inst.touchCount > 1 && hitGameObj != null || Stage.inst.touchCount == 1 && context.inputEvent.touchId != 0) return;//两根手指&&两指不是同时按下||一根手指但属于中途换指
             if (PhotographDataManager.Instance.IsTouchUI(this.viewCom)) return;
@@ -244,6 +257,7 @@ namespace GFGGame
                 Debug.Log("rotation:" + _ui.m_comSelectBox.target.rotation + "   " + _ui.m_comSelectBox.target.rotationX + "    " + _ui.m_comSelectBox.target.rotationY);
                 _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitGameObj);
                 ControllerSelectBoxPos();
+
             }
         }
         private void OnTouchUIMove(EventContext context)
@@ -475,6 +489,21 @@ namespace GFGGame
         private void OnClickBtnBg()
         {
             _ui.m_ComSelectRes.target.visible = false;
+            // GuideController.TryGuideOpenPhotographView(null);
+
+        }
+        private void OnClickLoaGuide()
+        {
+            _ui.m_loaGuide1.enabled = true;
+            _ui.m_loaGuide.enabled = false;
+            _ui.m_ComSelectRes.target.visible = false;
+            GuideController.TryGuideOpenPhotographView(_ui.m_loaGuide1);
+        }
+        private void OnClickLoaGuide1()
+        {
+            _ui.m_loaGuide1.enabled = false;
+            _ui.m_ComSelectRes.target.visible = false;
+            GuideController.TryGuideBtnSave(_ui.m_btnPhotograph);
         }
         private void OnTouchBtnFlipBegin()//翻转
         {
@@ -529,6 +558,7 @@ namespace GFGGame
         private void OnClickBtnPhotograph()
         {
             GuideController.HideGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH_GUIDE);
             _ui.target.visible = false;
             Timers.inst.StartCoroutine(ScreenShotTex());// ();
         }

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391g.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: a6041446ea1a9844887e1bf14cdbe956
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391h.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7d83192e079ac13478ca58a5c42c6e87
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391i.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 924f747b8e9362447a1bde3b5f38bc6a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: