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

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="229,42" extention="Button">
+<component size="240,62" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-9,0" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="181,-2" group="n4_qqat"/>
-    <text id="n1_r9gf" name="title" xy="47,1" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
-    <loader id="n2_r9gf" name="icon" xy="2,0" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <group id="n4_qqat" name="n4" xy="-9,-2" size="236,47"/>
+    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,9" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,7" group="n4_qqat"/>
+    <text id="n1_r9gf" name="title" xy="49,10" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
+    <loader id="n2_r9gf" name="icon" xy="4,9" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
+    <group id="n4_qqat" name="n4" xy="-7,7" size="236,47"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,47" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="8">
+<component size="1080,62" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="9">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -15,47 +15,47 @@
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="3"/>
-      <gearXY controller="c1" pages="3" values="814,2" default="460,5"/>
+      <gearXY controller="c1" pages="0,3" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="4"/>
-      <gearXY controller="c1" pages="4" values="814,2" default="460,5"/>
+      <gearXY controller="c1" pages="0,4" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="8"/>
-      <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|814,2" default="688,5"/>
+      <gearXY controller="c1" pages="0,1,5,6,8" values="814,0|684,2|684,2|684,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="9"/>
-      <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,2|684,2|814,2|684,2|684,2|814,2|814,2" default="688,5"/>
+      <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,0|684,2|814,2|684,2|684,2|814,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
     <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearXY controller="c1" pages="0,1,5" values="37,2|296,2|296,5" default="0,5"/>
+      <gearXY controller="c1" pages="0,1,5" values="37,0|296,0|296,5" default="0,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="5"/>
-      <gearXY controller="c1" pages="0,1,3,5" values="-780,5|1079,5|979,5|296,2" default="460,5"/>
+      <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="230,5">
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,0">
       <gearDisplay controller="c1" pages="0,1,6,7,10"/>
-      <gearXY controller="c1" pages="0,1,6,7,10" values="296,2|555,2|555,2|814,2|296,2" default="230,5"/>
+      <gearXY controller="c1" pages="0,1,6,7,10" values="296,0|555,0|555,0|814,0|296,0" default="230,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x3"/>
     </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,0">
       <gearDisplay controller="c1" pages="0,1,5,6,10"/>
-      <gearXY controller="c1" pages="0,1,3,5,6,10" values="555,2|814,5|979,5|555,2|814,2|555,2" default="460,5"/>
+      <gearXY controller="c1" pages="0,1,3,5,6,10" values="555,0|814,0|979,5|555,0|814,0|555,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x6"/>
     </component>
-    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="0,5,10"/>
-      <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,2|814,2|1207,5|814,2|814,2|688,5|814,2" default="688,5"/>
+      <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -216,7 +216,7 @@
     <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
     <image id="v95qtk1" name="luyin.png" path="/imgItemIcon/" exported="true"/>
     <image id="r9ril" name="grxx_xinxin.png" path="/imagesExport/" exported="true"/>
-    <image id="dhoatk2" name="hlhdjficon_1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="dhoatk2" name="hlhdjficon.png" path="/imgItemIcon/" exported="true"/>
     <image id="dhoatk3" name="shalou.png" path="/imgItemIcon/" exported="true"/>
     <image id="ysx9tk4" name="hqtjtbtb.png" path="/images/"/>
     <image id="ysx9tk5" name="lianyiqun_ys.png" path="/imgItemIcon/" exported="true"/>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -40,26 +40,26 @@
     <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n46_wono"/>
-    <text id="n22_8xpg" name="txtHint" xy="48,977" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦"/>
-    <group id="n46_wono" name="grpTips" xy="33,977" size="394,132" group="n38_8lqj" advanced="true">
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,886" group="n46_wono"/>
+    <text id="n22_8xpg" name="txtHint" xy="48,885" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦"/>
+    <group id="n46_wono" name="grpTips" xy="33,885" size="394,132" group="n38_8lqj" advanced="true">
       <relation target="n15_vxw5" sidePair="bottom-bottom"/>
     </group>
-    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1120" size="122,114" group="n44_wono">
+    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1028" size="122,114" group="n44_wono">
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
-    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1247" size="122,114" group="n44_wono" visible="false">
+    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1155" group="n44_wono" visible="false">
       <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1266" size="84,87" group="n44_wono"/>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1385" size="84,87" group="n44_wono"/>
-    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1504" size="84,87" group="n44_wono">
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono"/>
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono"/>
+    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1623" size="84,87" group="n44_wono">
+    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1600" group="n44_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="27,1120" size="122,590" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="27,1028" size="129,682" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
@@ -69,7 +69,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="mk0fwx0x" xy="480,1728" group="n47_v95q">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="480,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </component>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -33,10 +33,10 @@
         <item title="5"/>
       </ComboBox>
     </component>
-    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n30_8lqj">
+    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n30_8lqj">
+    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
@@ -45,39 +45,39 @@
     <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
+    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="300,1730" group="n30_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
+    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="300,1730" group="n30_8lqj">
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1124" size="141,120" group="n34_wono">
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1019" size="157,133" group="n34_wono">
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
-    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1276" size="84,87" group="n34_wono" aspect="true">
+    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1184" group="n34_wono">
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1404" size="84,87" group="n34_wono" visible="false">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1299" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1518" size="84,87" group="n34_wono" visible="false">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1413" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
-    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1395" size="84,87" group="n34_wono">
+    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1326" group="n34_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="56,1514" size="84,87" group="n34_wono">
+    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="56,1468" group="n34_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1633" size="84,87" group="n34_wono">
+    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1610" group="n34_wono">
       <Button icon="ui://mbo439wbrc0743"/>
     </component>
-    <group id="n34_wono" name="n34" xy="27,1124" size="141,596" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n34_wono" name="n34" xy="27,1019" size="157,701" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
     <group id="n30_8lqj" name="grpContent" xy="27,0" size="1283,1920" advanced="true">

FGUIProject/assets/DressUp/components/Button6.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="82,82" extention="Button">
+<component size="110,110" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n1_f4xv" name="icon" xy="0,0" size="82,82" url="ui://mbo439wbq08xo" autoSize="true"/>
+    <loader id="n1_f4xv" name="icon" xy="0,0" size="84,87" url="ui://mbo439wbq08xo" autoSize="true"/>
   </displayList>
   <Button/>
-  <relation target="n1_f4xv" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -6,7 +6,7 @@
     <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="756,969">
       <Button title="开始旅程"/>
     </component>
-    <loader id="n16_t8o1" name="loaderHead" xy="209,392" pivot="0.5,0.5" anchor="true" size="362,481" group="n54_rqo4" aspect="true" scale="-1,1" url="ui://mfvz4q8kv95qhp" align="center" fill="scale" clearOnPublish="true"/>
+    <loader id="n16_t8o1" name="loaderHead" xy="209,392" pivot="0.5,0.5" anchor="true" size="362,481" group="n54_rqo4" aspect="true" url="ui://mfvz4q8kv95qhp" align="center" fill="scale" clearOnPublish="true"/>
     <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,228" group="n61_v95q">
       <relation target="" sidePair="top-top"/>
     </image>

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

@@ -39,7 +39,7 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
-
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -49,6 +49,7 @@ namespace GFGGame
             _ui.m_btnSave.touchable = true;
             _ui.m_btnSavePhoto.selected = false;
             _ui.m_btnSavePhoto.touchable = true;
+            Timers.inst.Remove(CheckGuide);
         }
 
         public override void Dispose()
@@ -107,5 +108,33 @@ namespace GFGGame
             _ui.m_btnSavePhoto.touchable = false;
 
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
+            GuideController.TryCompleteGuideIndex(cfg.id, 9);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+        }
     }
 }

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

@@ -645,7 +645,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
             GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
+            // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");
 
@@ -653,7 +653,7 @@ namespace GFGGame
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
+            // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -163,6 +163,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            MainDataManager.Instance.CanSwipe = false;
+            GRoot.inst.touchable = false;
 
             _ui.m_headBar.m_txtName.text = RoleDataManager.roleName;
             if (_sceneObject == null)
@@ -589,6 +591,8 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
+            MainDataManager.Instance.CanSwipe = true;
+            GRoot.inst.touchable = true;
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0

GameClient/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs

@@ -190,9 +190,9 @@ namespace Live2D.Cubism.Framework.MotionFade
 
                 var instanceId = -1;
                 var events = animatorClipInfo[i].clip.events;
-                for(var k = 0; k < events.Length; ++k)
+                for (var k = 0; k < events.Length; ++k)
                 {
-                    if(events[k].functionName != "InstanceId")
+                    if (events[k].functionName != "InstanceId")
                     {
                         continue;
                     }