zhaoyang hace 2 años
padre
commit
d53796c2e8

+ 25 - 25
FGUIProject/assets/Main/componentsLevel/CompChapterScroll.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,4500" scroll="both" designImageLayer="1">
+<component size="1080,662" scroll="both" designImageLayer="1">
   <displayList>
-    <image id="n94_o4m7" name="n94" src="o4m7fqa" fileName="imagesNew/zxian_line.png" xy="72,2605" group="n117_o4m7" aspect="true">
+    <image id="n94_o4m7" name="n94" src="o4m7fqa" fileName="imagesNew/zxian_line.png" xy="72,-1233" group="n117_o4m7" aspect="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n95_o4m7" name="imgBegin" src="o4m7fq1" fileName="imagesNew/zxian_sel.png" xy="540,4283" pivot="0.5,0" anchor="true" group="n117_o4m7" aspect="true">
+    <image id="n95_o4m7" name="imgBegin" src="o4m7fq1" fileName="imagesNew/zxian_sel.png" xy="540,445" pivot="0.5,0" anchor="true" group="n117_o4m7" aspect="true">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n119_o4m7" name="g20" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="333,157" group="n139_o4m7" controller="c2,0"/>
-    <component id="n120_o4m7" name="g19" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="31,359" group="n139_o4m7"/>
-    <component id="n121_o4m7" name="g18" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="418,561" group="n139_o4m7"/>
-    <component id="n122_o4m7" name="g17" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="116,763" group="n139_o4m7" controller="c2,1"/>
-    <component id="n123_o4m7" name="g16" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="512,965" group="n139_o4m7" controller="c2,0"/>
-    <component id="n124_o4m7" name="g15" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="288,1167" group="n139_o4m7"/>
-    <component id="n125_o4m7" name="g14" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="45,1369" group="n139_o4m7"/>
-    <component id="n126_o4m7" name="g13" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="128,1571" group="n139_o4m7" controller="c2,1"/>
-    <component id="n127_o4m7" name="g12" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="490,1773" group="n139_o4m7" controller="c2,0"/>
-    <component id="n128_o4m7" name="g11" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="150,1975" group="n139_o4m7" controller="c2,0"/>
-    <component id="n129_o4m7" name="g10" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="538,2177" group="n139_o4m7" controller="c2,0"/>
-    <component id="n130_o4m7" name="g9" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="334,2379" group="n139_o4m7" controller="c2,0"/>
-    <component id="n131_o4m7" name="g8" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="64,2581" group="n139_o4m7" controller="c2,1"/>
-    <component id="n132_o4m7" name="g7" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="546,2783" group="n139_o4m7"/>
-    <component id="n133_o4m7" name="g6" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="212,2985" group="n139_o4m7" controller="c2,0"/>
-    <component id="n134_o4m7" name="g5" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="41,3187" group="n139_o4m7" controller="c2,1"/>
-    <component id="n135_o4m7" name="g4" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="444,3389" group="n139_o4m7"/>
-    <component id="n136_o4m7" name="g3" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="241,3591" group="n139_o4m7"/>
-    <component id="n137_o4m7" name="g2" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="125,3793" group="n139_o4m7"/>
-    <component id="n138_o4m7" name="g1" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="336,3995" group="n139_o4m7"/>
-    <group id="n139_o4m7" name="n139" xy="31,157" size="1055,4090" group="n117_o4m7" advanced="true" layout="vt" lineGap="-50" excludeInvisibles="true">
+    <component id="n119_o4m7" name="g20" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="333,157" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n120_o4m7" name="g19" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="31,359" group="n139_o4m7" visible="false"/>
+    <component id="n121_o4m7" name="g18" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="418,561" group="n139_o4m7" visible="false"/>
+    <component id="n122_o4m7" name="g17" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="116,763" group="n139_o4m7" visible="false" controller="c2,1"/>
+    <component id="n123_o4m7" name="g16" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="512,965" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n124_o4m7" name="g15" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="288,1167" group="n139_o4m7" visible="false"/>
+    <component id="n125_o4m7" name="g14" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="45,1369" group="n139_o4m7" visible="false"/>
+    <component id="n126_o4m7" name="g13" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="128,1571" group="n139_o4m7" visible="false" controller="c2,1"/>
+    <component id="n127_o4m7" name="g12" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="490,1773" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n128_o4m7" name="g11" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="150,1975" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n129_o4m7" name="g10" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="538,2177" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n130_o4m7" name="g9" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="334,2379" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n131_o4m7" name="g8" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="64,2581" group="n139_o4m7" visible="false" controller="c2,1"/>
+    <component id="n132_o4m7" name="g7" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="546,2783" group="n139_o4m7" visible="false"/>
+    <component id="n133_o4m7" name="g6" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="212,2985" group="n139_o4m7" visible="false" controller="c2,0"/>
+    <component id="n134_o4m7" name="g5" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="41,3187" group="n139_o4m7" visible="false" controller="c2,1"/>
+    <component id="n135_o4m7" name="g4" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="444,3389" group="n139_o4m7" visible="false"/>
+    <component id="n136_o4m7" name="g3" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="241,3591" group="n139_o4m7" visible="false"/>
+    <component id="n137_o4m7" name="g2" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="125,3793" group="n139_o4m7" visible="false"/>
+    <component id="n138_o4m7" name="g1" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="336,157" group="n139_o4m7"/>
+    <group id="n139_o4m7" name="n139" xy="336,157" size="540,252" group="n117_o4m7" visible="false" advanced="true" layout="vt" lineGap="-50" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <group id="n117_o4m7" name="n117" xy="31,157" size="1055,4242"/>
+    <group id="n117_o4m7" name="n117" xy="72,-1233" size="934,1794"/>
   </displayList>
   <relation target="n139_o4m7" sidePair="height-height"/>
 </component>

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

@@ -3,6 +3,7 @@ using UI.CommonGame;
 using UI.Main;
 using System.Collections.Generic;
 using UnityEngine;
+using System.Collections;
 
 namespace GFGGame
 {
@@ -76,8 +77,8 @@ namespace GFGGame
             _chapterID = (int)viewData;
             MainStoryDataManager.currentChapterCfgId = _chapterID;
             // StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
-
-            InitChapter();
+            Timers.inst.StartCoroutine(InitChapter());
+            // InitChapter();
             _valueBarController.OnShown();
             // _valueBarController.Controller(1);
             _ui.target.touchable = true;
@@ -111,7 +112,7 @@ namespace GFGGame
             GameController.GoBackToMainView();
         }
 
-        private void InitChapter()
+        private IEnumerator InitChapter()
         {
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
             _ui.m_txtChapterName0.text = chapterCfg.name.Length > 0 ? chapterCfg.name[0].ToString() : "";
@@ -130,10 +131,10 @@ namespace GFGGame
 
             var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id);
             int endLevel = 0;
+            int UnlockCount = 0;
 
             _compChapter = _ui.m_chapter.m_compChapterScroll.target;
             float starPosY = _ui.m_chapter.m_compChapterScroll.m_imgBegin.y;
-
             int lineGap = 4500 / list.Count;
             for (int i = 0; i < 20; i++)
             {
@@ -145,6 +146,7 @@ namespace GFGGame
                 UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
                 if (levelCfg != null && MainStoryDataManager.CheckLevelUnlock(levelCfg.id))
                 {
+                    UnlockCount++;
                     levelItem.target.data = levelCfg.id;
                     levelItem.target.visible = true;
                     levelItem.target.onClick.Clear();
@@ -181,8 +183,8 @@ namespace GFGGame
                         MainStoryDataManager.currentLevelCfgId = levelCfg.id;
 
                         _unPasslevelItem = levelItem.target;
-                        _gameObject = null;
-                        _wrapper = null;
+                        // _gameObject = null;
+                        // _wrapper = null;
                         string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
                         SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
                     }
@@ -198,7 +200,9 @@ namespace GFGGame
                 }
                 UI_CompStoryLevelItem.ProxyEnd();
             }
-            _ui.m_chapter.m_compChapterScroll.target.y = 0;// _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height;
+            yield return new WaitForEndOfFrame();
+
+            _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