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

FGUIProject/assets/Field/FieldUI.xml

@@ -11,42 +11,37 @@
     <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <image id="n12_ohun" name="n12" src="ohuni" fileName="images/tydc_jbkuang_1.png" xy="166,202" group="n19_ohun"/>
-    <component id="n5_s20j" name="btn0" src="s20j4" fileName="components/Button1.xml" xy="166,202" group="n19_ohun">
-      <Button checked="true" title="初级" icon="ui://5oh3t798ohunk" controller="c1" page="0"/>
+    <image id="n14_ohun" name="n14" src="ohunf" fileName="images/tydc_ztkuang.png" xy="316,215" size="465,93" group="n18_ohun"/>
+    <image id="n38_mzf8" name="n38" src="mzf815" fileName="images/tydc_zi_1.png" xy="404,239" group="n18_ohun"/>
+    <loader id="n39_mzf8" name="loaIcon" xy="645,240" size="44,41" group="n18_ohun" url="ui://5oh3t798mzf816" autoSize="true"/>
+    <group id="n18_ohun" name="grpScore" xy="316,215" size="465,93" advanced="true"/>
+    <component id="n7_s20j" name="btn2" src="s20j4" fileName="components/Button1.xml" xy="110,361" group="n19_ohun">
+      <Button title="高级" icon="ui://5oh3t798mzf814" controller="c1" page="2"/>
     </component>
-    <component id="n6_s20j" name="btn1" src="s20j4" fileName="components/Button1.xml" xy="416,202" group="n19_ohun">
-      <Button title="中级" icon="ui://5oh3t798ohunl" controller="c1" page="1"/>
+    <component id="n6_s20j" name="btn1" src="s20j4" fileName="components/Button1.xml" xy="593,869" group="n19_ohun">
+      <Button title="中级" icon="ui://5oh3t798mzf813" controller="c1" page="1"/>
     </component>
-    <component id="n7_s20j" name="btn2" src="s20j4" fileName="components/Button1.xml" xy="666,202" group="n19_ohun">
-      <Button title="高级" icon="ui://5oh3t798ohunm" controller="c1" page="2"/>
+    <component id="n5_s20j" name="btn0" src="s20j4" fileName="components/Button1.xml" xy="-24,1204" group="n19_ohun">
+      <Button title="初级" icon="ui://5oh3t798mzf812" controller="c1" page="0"/>
     </component>
-    <group id="n19_ohun" name="grpTab" xy="166,202" size="748,70" advanced="true"/>
-    <image id="n14_ohun" name="n14" src="ohunf" fileName="images/tydc_ztkuang.png" xy="258,343" group="n18_ohun"/>
-    <text id="n15_ohun" name="n15" xy="419,345" size="184,49" group="n18_ohun" fontSize="36" color="#fef1cc" text="本期主题："/>
-    <text id="n16_ohun" name="txtScore" xy="605,346" size="40,59" group="n18_ohun" fontSize="36" color="#fee398" autoSize="none" text="风"/>
-    <group id="n18_ohun" name="grpScore" xy="258,343" size="564,62" advanced="true"/>
-    <component id="n8_s20j" name="btnGo" src="s20j7" fileName="components/Button2.xml" xy="403,1223"/>
-    <text id="n20_ohun" name="txtMaxLv" xy="392,1538" pivot="0.5,0" size="295,49" fontSize="36" color="#fdf9df" strokeColor="#947550" strokeSize="2" text="最高记录：10/30"/>
-    <image id="n21_ohun" name="n21" src="ohunq" fileName="images/tydc_sldk.png" xy="402,1591" group="n24_ohun"/>
-    <loader id="n22_ohun" name="loaConsume" xy="456,1594" size="60,60" group="n24_ohun" url="ui://eg2y0ldpq08x4"/>
-    <text id="n23_ohun" name="txtConsume" xy="535,1594" size="101,54" group="n24_ohun" fontSize="40" color="#f4dba2" text="x666"/>
-    <group id="n24_ohun" name="grpconsume" xy="402,1591" size="276,64" advanced="true"/>
-    <image id="n25_ohun" name="n25" src="ohunh" fileName="images/tydc_dikuang_1.png" xy="0,1722" group="n29_ohun"/>
-    <component id="n9_s20j" name="btnTask" src="ohuny" fileName="components/Button6.xml" xy="476,1737" group="n29_ohun">
+    <group id="n19_ohun" name="grpTab" xy="-24,361" size="1045,1271" advanced="true"/>
+    <image id="n25_ohun" name="n25" src="ohunh" fileName="images/tydc_dikuang_1.png" xy="0,1707" group="n29_ohun"/>
+    <component id="n9_s20j" name="btnTask" src="ohuny" fileName="components/Button6.xml" xy="458,1736" group="n29_ohun">
       <Button title="上限提升"/>
     </component>
-    <component id="n26_ohun" name="proTaskReward" src="ohunz" fileName="components/ProgressBar1.xml" xy="198,1790" group="n29_ohun">
+    <text id="n37_mzf8" name="n37" xy="214,1740" size="186,62" group="n29_ohun" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#a48550" text="每周奖励"/>
+    <component id="n26_ohun" name="proTaskReward" src="ohunz" fileName="components/ProgressBar1.xml" xy="214,1812" group="n29_ohun">
       <ProgressBar value="50" max="100"/>
     </component>
-    <loader id="n28_ohun" name="loaTaskReward" xy="45,1736" size="135,135" group="n29_ohun" aspect="true" fill="scaleMatchWidth"/>
-    <image id="n27_ohun" name="n27" src="ohunp" fileName="images/tydc_mzjl.png" xy="40,1826" group="n29_ohun"/>
-    <group id="n29_ohun" name="grpTaskReward" xy="0,1722" size="756,176" advanced="true">
+    <image id="n35_mzf8" name="n35" src="mzf811" fileName="images/tydc_dikuang_2.png" xy="25,1725" group="n36_mzf8"/>
+    <loader id="n28_ohun" name="loaTaskReward" xy="36,1736" size="135,135" group="n36_mzf8" aspect="true" fill="scaleMatchWidth"/>
+    <group id="n36_mzf8" name="n36" xy="25,1725" size="154,154" group="n29_ohun"/>
+    <group id="n29_ohun" name="grpTaskReward" xy="0,1707" size="636,191" advanced="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
     <image id="n30_wet2" name="n30" src="wet210" fileName="images/tydc_dikuang_3.png" xy="806,1797" group="n32_wet2"/>
-    <text id="n31_wet2" name="txtTime" xy="917,1802" pivot="0.5,0" size="10,46" group="n32_wet2" fontSize="34" color="#f4dba2" align="center" text=""/>
-    <group id="n32_wet2" name="grpTime" xy="806,1797" size="234,58" advanced="true">
+    <text id="n31_wet2" name="txtTime" xy="917,1802" pivot="0.5,0" size="10,46" group="n32_wet2" fontSize="34" color="#feefd5" align="center" text=""/>
+    <group id="n32_wet2" name="grpTime" xy="806,1797" size="258,58" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/Field/components/Button1.xml

@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="248,70" extention="Button">
+<component size="428,428" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="c1" alias="是否开启" pages="0,,1," selected="0">
     <remark page="0" value="未开启"/>
     <remark page="1" value="已开启"/>
   </controller>
   <displayList>
-    <image id="n6_ohun" name="n6" src="ohunj" fileName="images/tydc_jbkuang_2.png" xy="2,0">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
-    <loader id="n7_ohun" name="icon" xy="52,10" size="88,51" group="n9_qjjq" url="ui://5oh3t798ohunk" autoSize="true">
-      <gearDisplay controller="button" pages="1"/>
-    </loader>
-    <text id="n3_s20j" name="title" xy="52,7" size="88,52" group="n9_qjjq" fontSize="38" color="#e3d49f" align="center" vAlign="middle" autoSize="none" singleLine="true" text="初级">
-      <gearDisplay controller="button" pages="0"/>
-      <gearColor controller="button" pages="1" values="#fff8df,#fef6d9" default="#e3d49f,#000000"/>
-    </text>
-    <image id="n8_ohun" name="imgLock" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="140,25" size="71,37" group="n9_qjjq" scale="0.7,0.7">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <group id="n9_qjjq" name="n9" xy="52,7" size="159,55" advanced="true" layout="hz" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
+    <loader id="n7_ohun" name="icon" xy="0,0" size="428,429" url="ui://5oh3t798mzf812" autoSize="true"/>
+    <loader id="n10_mzf8" name="loaConsume" xy="184,310" size="60,60" url="ui://eg2y0ldpq08x4"/>
+    <text id="n11_mzf8" name="txtConsume" xy="223,326" size="71,54" fontSize="40" color="#fcfaf4" strokeColor="#886d2f" strokeSize="2" text="x66"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Field/components/ProgressBar1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="262,14" extention="ProgressBar">
+<component size="216,8" extention="ProgressBar">
   <displayList>
-    <image id="n0_ohun" name="n0" src="ohunn" fileName="images/tydc_jdt_1.png" xy="0,0" size="262,14">
+    <image id="n0_ohun" name="n0" src="ohunn" fileName="images/tydc_jdt_1.png" xy="-1,-1">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_ohun" name="bar" src="ohuno" fileName="images/tydc_jdt_2.png" xy="0,2" size="262,10"/>
-    <text id="n2_ohun" name="title" xy="0,16" size="262,46" fontSize="34" color="#f4dba2" align="center" vAlign="middle" autoSize="none" text="100/800">
+    <image id="n1_ohun" name="bar" src="ohuno" fileName="images/tydc_jdt_2.png" xy="0,0"/>
+    <text id="n2_ohun" name="title" xy="0,16" size="216,42" fontSize="30" color="#c8b697" autoSize="none" text="100/800">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Field/package.xml

@@ -33,6 +33,15 @@
     <component id="ohuny" name="Button6.xml" path="/components/"/>
     <component id="ohunz" name="ProgressBar1.xml" path="/components/"/>
     <image id="wet210" name="tydc_dikuang_3.png" path="/images/"/>
+    <image id="mzf811" name="tydc_dikuang_2.png" path="/images/"/>
+    <image id="mzf812" name="tydc_djdj_1.png" path="/images/"/>
+    <image id="mzf813" name="tydc_djdj_2.png" path="/images/"/>
+    <image id="mzf814" name="tydc_djdj_3.png" path="/images/"/>
+    <image id="mzf815" name="tydc_zi_1.png" path="/images/"/>
+    <image id="mzf816" name="tydc_zizi_1.png" path="/images/" exported="true"/>
+    <image id="mzf817" name="tydc_zizi_2.png" path="/images/" exported="true"/>
+    <image id="mzf818" name="tydc_zizi_3.png" path="/images/" exported="true"/>
+    <image id="mzf819" name="tydc_zizi_4.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button1.cs

@@ -8,7 +8,8 @@ namespace UI.Field
     {
         public GButton target;
         public Controller m_c1;
-        public GImage m_imgLock;
+        public GLoader m_loaConsume;
+        public GTextField m_txtConsume;
         public const string URL = "ui://5oh3t798s20j4";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "Button1";
@@ -57,12 +58,14 @@ namespace UI.Field
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_loaConsume = (GLoader)comp.GetChild("loaConsume");
+            m_txtConsume = (GTextField)comp.GetChild("txtConsume");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_imgLock = null;
+            m_loaConsume = null;
+            m_txtConsume = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs

@@ -11,17 +11,12 @@ namespace UI.Field
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
-        public UI_Button1 m_btn0;
-        public UI_Button1 m_btn1;
+        public GLoader m_loaIcon;
+        public GGroup m_grpScore;
         public UI_Button1 m_btn2;
+        public UI_Button1 m_btn1;
+        public UI_Button1 m_btn0;
         public GGroup m_grpTab;
-        public GTextField m_txtScore;
-        public GGroup m_grpScore;
-        public GButton m_btnGo;
-        public GTextField m_txtMaxLv;
-        public GLoader m_loaConsume;
-        public GTextField m_txtConsume;
-        public GGroup m_grpconsume;
         public GButton m_btnTask;
         public GProgressBar m_proTaskReward;
         public GLoader m_loaTaskReward;
@@ -79,17 +74,12 @@ namespace UI.Field
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btn0 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn0"));
-            m_btn1 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn1"));
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
             m_btn2 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn2"));
+            m_btn1 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn1"));
+            m_btn0 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn0"));
             m_grpTab = (GGroup)comp.GetChild("grpTab");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
-            m_grpScore = (GGroup)comp.GetChild("grpScore");
-            m_btnGo = (GButton)comp.GetChild("btnGo");
-            m_txtMaxLv = (GTextField)comp.GetChild("txtMaxLv");
-            m_loaConsume = (GLoader)comp.GetChild("loaConsume");
-            m_txtConsume = (GTextField)comp.GetChild("txtConsume");
-            m_grpconsume = (GGroup)comp.GetChild("grpconsume");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_proTaskReward = (GProgressBar)comp.GetChild("proTaskReward");
             m_loaTaskReward = (GLoader)comp.GetChild("loaTaskReward");
@@ -103,20 +93,15 @@ namespace UI.Field
             m_loaBg = null;
             m_comValueBar = null;
             m_btnBack = null;
-            m_btn0.Dispose();
-            m_btn0 = null;
-            m_btn1.Dispose();
-            m_btn1 = null;
+            m_loaIcon = null;
+            m_grpScore = null;
             m_btn2.Dispose();
             m_btn2 = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btn0.Dispose();
+            m_btn0 = null;
             m_grpTab = null;
-            m_txtScore = null;
-            m_grpScore = null;
-            m_btnGo = null;
-            m_txtMaxLv = null;
-            m_loaConsume = null;
-            m_txtConsume = null;
-            m_grpconsume = null;
             m_btnTask = null;
             m_proTaskReward = null;
             m_loaTaskReward = null;

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -41,10 +41,12 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnGo.onClick.Add(OnClickBtnGo);
+            // _ui.m_btnGo.onClick.Add(OnClickBtnGo);
             _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
-
-            _ui.m_c1.onChanged.Add(OnDifficultyChange);
+            _ui.m_btn0.target.onClick.Add(OnDifficultyChange);
+            _ui.m_btn1.target.onClick.Add(OnDifficultyChange);
+            _ui.m_btn2.target.onClick.Add(OnDifficultyChange);
+            // _ui.m_c1.onChanged.Add(OnDifficultyChange);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
         }
@@ -68,12 +70,12 @@ namespace GFGGame
             _dataManager.chapterId = _curCfg.id;
 
 
-            FieldCfg[] cfgs = FieldCfgArray.Instance.dataArray;
-            for (int i = 0; i < cfgs.Length; i++)
-            {
-                bool isPass = i == 0 ? true : InstanceZonesDataManager.CheckLevelPass(cfgs[i].storyLvId);
-                _ui.target.GetChild("btn" + i).asButton.GetChild("imgLock").asImage.visible = !isPass;
-            }
+            // FieldCfg[] cfgs = FieldCfgArray.Instance.dataArray;
+            // for (int i = 0; i < cfgs.Length; i++)
+            // {
+            //     bool isPass = i == 0 ? true : InstanceZonesDataManager.CheckLevelPass(cfgs[i].storyLvId);
+            //     _ui.target.GetChild("btn" + i).asButton.GetChild("imgLock").asImage.visible = !isPass;
+            // }
             UpdateView();
 
             Timers.inst.Add(1, 0, UpdateShowTime);
@@ -113,24 +115,28 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(str);
                 return;
             }
-            FieldCfg priorfg = priorIndex >= 0 ? FieldCfgArray.Instance.dataArray[priorIndex] : null;
-            if (priorIndex >= 0 && _dataManager.GetHighestLvByChapterId(priorfg.id) < priorfg.num)
-            {
-                _ui.m_c1.selectedIndex = _selectedIndex;
-                PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
-                return;
-            }
+            // FieldCfg priorfg = priorIndex >= 0 ? FieldCfgArray.Instance.dataArray[priorIndex] : null;
+            // if (priorIndex >= 0 && _dataManager.GetHighestLvByChapterId(priorfg.id) < priorfg.num)
+            // {
+            //     _ui.m_c1.selectedIndex = _selectedIndex;
+            //     PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
+            //     return;
+            // }
             _selectedIndex = _ui.m_c1.selectedIndex;
             _curCfg = FieldCfgArray.Instance.dataArray[_selectedIndex]; ;
             _dataManager.chapterId = _curCfg.id;
             _dataManager.difficulty = _selectedIndex;
-            UpdateView();
+            // UpdateView();
+            OnClickBtnGo();
         }
         private void UpdateView()
         {
-            _ui.m_txtScore.text = ConstDressUpScoreType.scoreTypeList()[_dataManager.fieldInfos.theme].ToString();
-            _ui.m_txtMaxLv.text = string.Format("最高记录:{0}/{1}", _dataManager.GetHighestLvByChapterId(_dataManager.chapterId), _curCfg.num);
-            _ui.m_txtConsume.text = string.Format("x{0}", _curCfg.needPower);
+            _ui.m_loaIcon.url = string.Format("ui://Field/tydc_zizi_{0}", _dataManager.fieldInfos.theme);
+            // _ui.m_txtScore.text = ConstDressUpScoreType.scoreTypeList()[_dataManager.fieldInfos.theme].ToString();
+            // _ui.m_txtMaxLv.text = string.Format("最高记录:{0}/{1}", _dataManager.GetHighestLvByChapterId(_dataManager.chapterId), _curCfg.num);
+            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[0].needPower);
+            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[1].needPower);
+            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", FieldCfgArray.Instance.dataArray[2].needPower);
             _ui.m_proTaskReward.max = _dataManager.fieldInfos.bonusMaxLimit;
             _ui.m_proTaskReward.value = _dataManager.fieldInfos.bonusWeekly;
             _ui.m_loaTaskReward.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED));

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -83,7 +83,7 @@ namespace GFGGame
             _ui.m_btnTapLogin.visible = false;
             _ui.m_btnLogout.visible = false;
 
-            if(QDManager.isInited)
+            if (QDManager.isInited)
             {
                 EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
             }
@@ -129,6 +129,7 @@ namespace GFGGame
 
         private void OnPlatformInitet(EventContext context)
         {
+            ViewManager.Hide<ModalStatusView>();
             var success = (bool)context.data;
             Debug.Log($"InitPlatform success {success}");
             if (success)
@@ -136,7 +137,7 @@ namespace GFGGame
                 QDManager.isInited = true;
                 _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
                 _ui.m_btnStart.visible = !QDManager.IsTaptap;
-                if(QDManager.IsHYKB)
+                if (QDManager.IsHYKB)
                 {
                     Timers.inst.Add(1, 1, DelayToHYKBLogin);
                 }
@@ -148,20 +149,19 @@ namespace GFGGame
             }
             else
             {
-                ViewManager.Hide<ModalStatusView>();
                 AlertSystem.Show("初始化平台sdk失败！")
                 .SetRightButton(true, "重试", (t) => { QDManager.InitPlatform(); });
             }
-            
+
         }
 
         private void OnPlatformLogined(EventContext context)
         {
             var account = (string)context.data;
-            if(!string.IsNullOrEmpty(account))
+            if (!string.IsNullOrEmpty(account))
             {
                 _ui.m_btnTapLogin.visible = false;
-                if(QDManager.IsHYKB)
+                if (QDManager.IsHYKB)
                 {
                     //好游快爆因为SDK的防沉迷会使游戏失去焦点，需要检测焦点
                     focusCount = 0;
@@ -190,10 +190,10 @@ namespace GFGGame
         private int focusCount;
         private void CheckHykbLoginServer(object obj)
         {
-            if(Application.isFocused)
+            if (Application.isFocused)
             {
                 focusCount++;
-                if(focusCount >= 2)
+                if (focusCount >= 2)
                 {
                     LoginController.LoginTest(QDHYKBManager.Instance.UserId).Coroutine();
                     Timers.inst.Remove(CheckHykbLoginServer);
@@ -245,7 +245,7 @@ namespace GFGGame
                 {
                     QDHYKBManager.Instance.Login();
                 }
-                else if(QDManager.IsBiliBili)
+                else if (QDManager.IsBiliBili)
                 {
                     QDBiliBiliManager.Instance.Login();
                 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -83,10 +83,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            // if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
-            // {
-            //     GRoot.inst.touchable = false;
-            // }
 
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
             if (this.viewData != null)
@@ -317,7 +313,8 @@ namespace GFGGame
         private void OnClickBtnBuyTen(EventContext context)
         {
 
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0 && !ViewManager.isViewOpen(typeof(GuideView).FullName))
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0 && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideIdIndex != 2))
             {
                 //防止点击太快，在引导开启前就被点击到，导致引导卡死
                 return;
@@ -333,6 +330,7 @@ namespace GFGGame
             }
             LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.TEN_TIME, async () =>
             {
+
                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.TEN_TIME);
                 if (result)
                 {
@@ -400,5 +398,11 @@ namespace GFGGame
             GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。", -1, true, _ui.target.height - 600);
             GuideController.TryGuide(btnBuyTen, ConstGuideId.LUCKY_BOX, 2, "点击摘取十次。");
         }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
+            GuideController.TryCompleteGuideIndex(cfg.id, 2);
+        }
     }
 }