引导

FGUIProject/assets/CommonGame/package.xml

@@ -238,6 +238,7 @@
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
     <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
+    <image id="v95qtk1" name="luyin.png" path="/imgItemIcon/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -25,10 +25,10 @@
     <text id="n14_vxw5" name="txtScore" xy="78,232" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
     <group id="n33_j48o" name="n33" xy="23,230" size="204,57" group="n38_8lqj"/>
     <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,305" group="n38_8lqj"/>
-    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
+    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
@@ -65,14 +65,17 @@
     <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n38_8lqj">
+    <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button13.xml" xy="480,1728" group="n38_8lqj" pkg="eg2y0ldp">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="eg2y0ldp" xy="480,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </component>
+    <group id="n47_v95q" name="n47" xy="140,1728" size="684,97" group="n38_8lqj" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
     <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>

FGUIProject/assets/Guide/GuideUI.xml

@@ -8,6 +8,6 @@
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="540,959" pivot="0.5,0.5" anchor="true" touchable="false"/>
-    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="80,1182" touchable="false"/>
+    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="80,1182" visible="false" touchable="false"/>
   </displayList>
 </component>

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

@@ -151,6 +151,7 @@ namespace GFGGame
             GameGlobal.userId = 0;
             GameGlobal.userAge = 0;
             GameGlobal.skipGuide = false;
+            GuideDataManager.currentGuideId = 0;
             MainDataManager.Instance.ViewType = 0;
             RoleDataHandler.StopUpdate();
             CardDataManager.Clear();
@@ -217,7 +218,8 @@ namespace GFGGame
                     if (GameGlobal.isFirstEntry == true)
                     {
                         GameGlobal.isFirstEntry = false;
-                        StoryController.ShowPriorStoryDialog();
+                        // StoryController.ShowPriorStoryDialog();
+                        StoryController.ShowLevelView(100001001);
                     }
                     else
                     {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLock.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComLock
-    {
-        public GComponent target;
-        public GLoader m_icon;
-        public GTextField m_txtLock;
-        public const string URL = "ui://eg2y0ldpv95qhq";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComLock";
-        private static UI_ComLock _proxy;
-
-        public static UI_ComLock Create(GObject gObject = null)
-        {
-            var ui = new UI_ComLock();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComLock Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComLock();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_icon = null;
-            m_txtLock = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLock.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 07dabc907154a36449e2455c81572377
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1043,7 +1043,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.START_FIGHT, 3, "点击相应的分类，可以快速找到服饰。", taozhuangIndex);
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.START_FIGHT, 4, "", 0);
             GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.START_FIGHT, 5, "穿着完毕，来验证一下，换上的服饰是否符合需求。");
-            GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
+            // GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时，需要穿上对应物品才能通关。");
             GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦。", buyClothingIndex);
@@ -1057,8 +1057,12 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnAutoPlay, ConstGuideId.AUTOPLAY_FIGHT, 2, "勾选后，自动进行比拼哦~~");
             GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 2);
 
+        }
 
-
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
         }
     }
 }

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

@@ -637,6 +637,11 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");
 
         }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
+        }
     }
 }
 

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -16,7 +16,7 @@ namespace GFGGame
         private int guideIndex;
         private bool justHint;//仅提示，不提示点击，无遮罩，点击任何地方可关闭引导
         private float compTxtY = 0;//提示语位置
-
+        private string txtContent = "";
         private GameObject _gameObject;
         private GoWrapper _wrapper;
 
@@ -62,7 +62,7 @@ namespace GFGGame
 
             List<object> dataList = viewData as List<object>;
             guideTarget = dataList[0] as GObject;
-            string txtContent = (string)dataList[1];
+            txtContent = (string)dataList[1];
 
             guideId = (int)dataList[2];
             guideIndex = (int)dataList[3];
@@ -73,15 +73,15 @@ namespace GFGGame
             MainDataManager.Instance.CanSwipe = false;
 
             UpdateComTxt(txtContent);
-            _ui.m_comHolder.target.visible = false;
+
             _ui.m_mask.target.visible = false;
             _ui.m_loaMask.visible = false;
             if (guideTarget != null)
             {
 
                 Timers.inst.AddUpdate(UpdateGuideRect);
-                _ui.m_comHolder.target.visible = true;
                 _ui.m_mask.target.visible = true;
+
                 guideTarget.onClick.Add(OnClickTarget);
             }
             else
@@ -91,6 +91,9 @@ namespace GFGGame
                 {
                     _ui.m_compTxt.target.y = compTxtY;
                 }
+
+                _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
+
             }
 
         }
@@ -99,6 +102,10 @@ namespace GFGGame
         {
 
             base.OnHide();
+            _ui.m_comHolder.target.visible = false;
+            _ui.m_compTxt.target.visible = false;
+
+            // guideTarget.onClick.Remove(OnClickTarget);
             guideTarget = null;
             Timers.inst.Remove(UpdateGuideRect);
         }
@@ -120,7 +127,6 @@ namespace GFGGame
                 {
                     this._ui.m_compTxt.m_txt.align = AlignType.Center;
                 }
-                _ui.m_compTxt.target.visible = true;
 
                 this._ui.m_compTxt.m_txtBg.height = this._ui.m_compTxt.m_txtBg.initHeight;
                 if (this._ui.m_compTxt.m_txt.textHeight > this._ui.m_compTxt.m_txt.textFormat.size * 3)
@@ -140,33 +146,37 @@ namespace GFGGame
                 if (_ui.m_mask.m_guideArea.xy == pos)
                 {
                     Timers.inst.Remove(UpdateGuideRect);
+                    _ui.m_comHolder.target.position = _ui.m_mask.m_guideArea.position;
+
+                    if (pos.x > GRoot.inst.width / 2)
+                    {
+                        _ui.m_comHolder.m_c1.selectedIndex = 0;//手在左边
+                    }
+                    else
+                    {
+                        _ui.m_comHolder.m_c1.selectedIndex = 1;//手在右边
+                    }
+                    _ui.m_comHolder.target.visible = true;
+                    _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
+
+
+                    int padding = 200;
+                    if (pos.y < GRoot.inst.height - 700)
+                    {
+                        _ui.m_compTxt.target.y = pos.y + padding;
+                    }
+                    else
+                    {
+                        _ui.m_compTxt.target.y = pos.y - padding - _ui.m_compTxt.target.height;
+                    }
+                    if (compTxtY > 0)
+                    {
+                        _ui.m_compTxt.target.y = compTxtY;
+                    }
                     return;
                 }
                 _ui.m_mask.m_guideArea.SetXY(pos.x, pos.y);
-                _ui.m_comHolder.target.position = _ui.m_mask.m_guideArea.position;
 
-                if (pos.x > GRoot.inst.width / 2)
-                {
-                    _ui.m_comHolder.m_c1.selectedIndex = 0;//手在左边
-                }
-                else
-                {
-                    _ui.m_comHolder.m_c1.selectedIndex = 1;//手在右边
-                }
-
-                int padding = 200;
-                if (pos.y < GRoot.inst.height - 700)
-                {
-                    _ui.m_compTxt.target.y = pos.y + padding;
-                }
-                else
-                {
-                    _ui.m_compTxt.target.y = pos.y - padding - _ui.m_compTxt.target.height;
-                }
-                if (compTxtY > 0)
-                {
-                    _ui.m_compTxt.target.y = compTxtY;
-                }
             }
         }
 

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

@@ -208,6 +208,7 @@ namespace GFGGame
             int levelCfgId = (int)levelItem.target.data;
             UI_CompStoryLevelItem.ProxyEnd();
             StoryController.ShowLevelView(levelCfgId);
+            TryCompleteGuide();
         }
 
         private void UpdateBonusBoxName(UI_CompBonusBox bonusBox, string name)
@@ -268,6 +269,7 @@ namespace GFGGame
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -293,8 +295,15 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
         }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
+            GuideController.TryCompleteGuideIndex(cfg.id, 5);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
 
-    }
+        }
 
+    }
 }
 

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

@@ -147,9 +147,9 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
-            StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
+            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
 
         }
         protected override void AddEventListener()

GameClient/Assets/ResIn/UI/Main/Main_atlas_v95qhy!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 144d6c5590ef93941a308b958df0b678
+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/Main/Main_atlas_v95qhy.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 412ec0a83b937ae4999f0ddedc9192db
+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: