zhaoyang 2 жил өмнө
parent
commit
0ce5663165

+ 6 - 0
FGUIProject/assets/Main/components/ComEff.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="540,252">
+  <displayList>
+    <graph id="n22_o4m7" name="holder" xy="269,125" size="1,1"/>
+  </displayList>
+</component>

+ 10 - 10
FGUIProject/assets/Main/components/CompStoryLevelItem.xml

@@ -4,35 +4,35 @@
     <remark page="0" value="剧情"/>
     <remark page="1" value="对战"/>
   </controller>
-  <controller name="c2" exported="true" pages="0,,1," selected="0">
+  <controller name="c2" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="向左"/>
     <remark page="1" value="向右"/>
   </controller>
   <displayList>
-    <component id="n12_o4m7" name="comDialogBg" src="o4m7fr5" fileName="components/ComDialogBg.xml" xy="118,73" group="n19_o4m7" controller="c1,4">
+    <component id="n12_o4m7" name="comDialogBg" src="o4m7fr5" fileName="components/ComDialogBg.xml" xy="107,73" group="n19_o4m7" controller="c1,4">
       <gearXY controller="c2" pages="0,1" values="118,73|107,73"/>
     </component>
-    <loader id="n13_o4m7" name="loaDialogBg" xy="0,0" pivot="0.5,0.5" size="540,216" group="n19_o4m7" scale="-1,1" url="ui://mfvz4q8ko4m7fq2" autoSize="true">
+    <loader id="n13_o4m7" name="loaDialogBg" xy="0,0" pivot="0.5,0.5" size="540,216" group="n19_o4m7" url="ui://mfvz4q8ko4m7fq2" autoSize="true">
       <gearSize controller="c2" pages="0" values="540,216,-1,1" default="540,216,1,1"/>
     </loader>
-    <text id="n14_o4m7" name="txtDialogOrder" xy="181,16" pivot="0.5,0" size="98,50" group="n17_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="34" color="#ffffff" align="right" letterSpacing="-4" text="0-0">
+    <text id="n14_o4m7" name="txtDialogOrder" xy="129,16" pivot="0.5,0" size="98,50" group="n17_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="34" color="#ffffff" align="right" letterSpacing="-4" text="0-0">
       <relation target="n13_o4m7" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n16_o4m7" name="n16" src="o4m7fqb" fileName="imagesNew/zxian_name_dec.png" xy="264,0" group="n17_o4m7"/>
-    <text id="n15_o4m7" name="txtName" xy="301,23" size="122,41" group="n17_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#ffeabf" text="曲水流觞"/>
-    <group id="n17_o4m7" name="n17" xy="181,0" size="242,74" group="n19_o4m7" advanced="true" layout="hz" colGap="-15">
+    <image id="n16_o4m7" name="n16" src="o4m7fqb" fileName="imagesNew/zxian_name_dec.png" xy="212,0" group="n17_o4m7"/>
+    <text id="n15_o4m7" name="txtName" xy="249,23" size="122,41" group="n17_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#ffeabf" text="曲水流觞"/>
+    <group id="n17_o4m7" name="n17" xy="129,0" size="242,74" group="n19_o4m7" advanced="true" layout="hz" colGap="-15">
       <gearXY controller="c2" pages="1" values="129,0" default="181,0"/>
     </group>
     <group id="n19_o4m7" name="n19" xy="0,0" size="540,216" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <loader id="n28_o4m7" name="n28" xy="89,48" pivot="0.5,0.5" size="361,120" group="n24_o4m7" url="ui://mfvz4q8ko4m7frd" autoSize="true">
+    <loader id="n28_o4m7" name="n28" xy="89,48" pivot="0.5,0.5" size="361,120" group="n24_o4m7" scale="-1,1" url="ui://mfvz4q8ko4m7frd" autoSize="true">
       <gearSize controller="c2" pages="1" values="361,120,-1,1" default="361,120,1,1"/>
     </loader>
     <image id="n25_o4m7" name="n25" src="o4m7fre" fileName="imagesNew/zxgq_zdtb.png" xy="179,48" group="n26_o4m7">
       <gearDisplay controller="c2" pages="0"/>
     </image>
-    <text id="n20_o4m7" name="txtFightOrder" xy="255,59" pivot="0.5,0" size="106,50" group="n26_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="30" color="#ffffff" align="center" text="1-1">
+    <text id="n20_o4m7" name="txtFightOrder" xy="179,59" pivot="0.5,0" size="106,50" group="n26_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="30" color="#ffffff" align="center" text="1-1">
       <gearXY controller="c2" pages="0,1" values="255,59|179,59"/>
     </text>
     <image id="n27_o4m7" name="n27" src="o4m7fre" fileName="imagesNew/zxgq_zdtb.png" xy="285,48" group="n26_o4m7">
@@ -45,6 +45,6 @@
     <group id="n24_o4m7" name="n24" xy="89,48" size="361,149" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <graph id="n22_o4m7" name="holder" xy="269,125" size="1,1"/>
+    <graph id="n29_o4m7" name="holder" xy="269,125" size="10,10"/>
   </displayList>
 </component>

+ 1 - 0
FGUIProject/assets/Main/package.xml

@@ -722,6 +722,7 @@
     <image id="o4m7fsn" name="zxian_chapter_8.png" path="/imagesExport/" exported="true"/>
     <image id="o4m7fso" name="zxian_chapter_lock_bg_l.png" path="/imagesNew/"/>
     <component id="o4m7fsp" name="ComCardSelect.xml" path="/components/" exported="true"/>
+    <component id="o4m7fss" name="ComEff.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComEff.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComEff
+    {
+        public GComponent target;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8ko4m7fss";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComEff";
+        private static UI_ComEff _proxy;
+
+        public static UI_ComEff Create(GObject gObject = null)
+        {
+            var ui = new UI_ComEff();
+            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_ComEff Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComEff();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComEff.cs.meta

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

+ 20 - 7
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -18,8 +18,15 @@ namespace GFGGame
 
         private GameObject _gameObject;
         private GoWrapper _wrapper;
+
+        private GComponent _comEff;
         public override void Dispose()
         {
+            if (_comEff != null)
+            {
+                _comEff.RemoveFromParent();
+                _comEff.Dispose();
+            }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -64,6 +71,11 @@ namespace GFGGame
             });
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
+            _comEff = new GComponent();
+            _comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
+            string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
+            SceneController.AddObjectToView(_gameObject, _wrapper, _comEff.GetChild("holder").asGraph, resPath, out _gameObject, out _wrapper);
+
         }
         protected override void AddEventListener()
         {
@@ -76,8 +88,8 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _chapterID = (int)viewData;
             MainStoryDataManager.currentChapterCfgId = _chapterID;
-            InitChapter();
-            // Timers.inst.StartCoroutine(InitChapter());
+
+            Timers.inst.StartCoroutine(InitChapter());
 
             _valueBarController.OnShown();
 
@@ -112,7 +124,7 @@ namespace GFGGame
             GameController.GoBackToMainView();
         }
 
-        private void InitChapter()
+        private IEnumerator InitChapter()
         {
             Debug.Log("InitChapter 000");
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
@@ -202,16 +214,17 @@ namespace GFGGame
                     Debug.Log("InitChapter_ 025  _:" + levelItem.m_holder);
                     levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
                     Debug.Log("InitChapter_ 026  _:" + UnlockCount);
-                    if (levelItem.m_holder.visible)
+                    if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
                     {
                         Debug.Log("InitChapter_ 027  _:" + UnlockCount);
                         //设置为解锁关卡
                         MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                         _unPasslevelItem = levelItem.target;
                         Debug.Log("InitChapter_ 028  _:" + UnlockCount);
-                        string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
-                        SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
+                        // string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
+                        // SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
                         Debug.Log("InitChapter_ 029  _:" + UnlockCount);
+                        levelItem.target.AddChild(_comEff);
                     }
                     if (levelCfg.order > endLevel)
                     {
@@ -231,7 +244,7 @@ namespace GFGGame
                 UI_CompStoryLevelItem.ProxyEnd();
             }
             Debug.Log("InitChapter 035");
-            // yield return new WaitForEndOfFrame();
+            yield return new WaitForEndOfFrame();
             Debug.Log("InitChapter 036");
             _ui.m_chapter.m_compChapterScroll.target.y = Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
 

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes