主线剧情UI修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonStoryType.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonStoryType
-    {
-        public GButton target;
-        public GLoader m_up;
-        public GLoader m_down;
-        public const string URL = "ui://mfvz4q8kzjj37x";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonStoryType";
-        private static UI_ButtonStoryType _proxy;
-
-        public static UI_ButtonStoryType Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonStoryType();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonStoryType Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonStoryType();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_up = (GLoader)comp.GetChild("up");
-            m_down = (GLoader)comp.GetChild("down");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_up = null;
-            m_down = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonStoryType.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonStoryType1.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonStoryType1
-    {
-        public GButton target;
-        public GLoader m_up;
-        public GLoader m_down;
-        public const string URL = "ui://mfvz4q8ko4m7fsf";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonStoryType1";
-        private static UI_ButtonStoryType1 _proxy;
-
-        public static UI_ButtonStoryType1 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonStoryType1();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonStoryType1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonStoryType1();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_up = (GLoader)comp.GetChild("up");
-            m_down = (GLoader)comp.GetChild("down");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_up = null;
-            m_down = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonStoryType1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapterScroll.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapterScroll
     {
         public GComponent target;
-        public GImage m_imgBegin;
+        public GLoader m_imgBegin;
         public UI_CompStoryLevelItem m_g20;
         public UI_CompStoryLevelItem m_g19;
         public UI_CompStoryLevelItem m_g18;
@@ -75,7 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_imgBegin = (GImage)comp.GetChild("imgBegin");
+            m_imgBegin = (GLoader)comp.GetChild("imgBegin");
             m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
             m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
             m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompStoryLevelItem.cs

@@ -13,7 +13,10 @@ namespace UI.Main
         public GLoader m_loaDialogBg;
         public GTextField m_txtDialogOrder;
         public GTextField m_txtName;
+        public GLoader m_fightBg;
+        public GLoader m_fightIconA;
         public GTextField m_txtFightOrder;
+        public GLoader m_fightIconB;
         public UI_CompFlower2 m_flower;
         public GGraph m_holder;
         public const string URL = "ui://mfvz4q8ko4m7fqd";
@@ -69,7 +72,10 @@ namespace UI.Main
             m_loaDialogBg = (GLoader)comp.GetChild("loaDialogBg");
             m_txtDialogOrder = (GTextField)comp.GetChild("txtDialogOrder");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_fightBg = (GLoader)comp.GetChild("fightBg");
+            m_fightIconA = (GLoader)comp.GetChild("fightIconA");
             m_txtFightOrder = (GTextField)comp.GetChild("txtFightOrder");
+            m_fightIconB = (GLoader)comp.GetChild("fightIconB");
             m_flower = (UI_CompFlower2)UI_CompFlower2.Create(comp.GetChild("flower"));
             m_holder = (GGraph)comp.GetChild("holder");
         }
@@ -82,7 +88,10 @@ namespace UI.Main
             m_loaDialogBg = null;
             m_txtDialogOrder = null;
             m_txtName = null;
+            m_fightBg = null;
+            m_fightIconA = null;
             m_txtFightOrder = null;
+            m_fightIconB = null;
             m_flower.Dispose();
             m_flower = null;
             m_holder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentChapterPic.cs

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_pic;
+        public GLoader m_bg;
         public const string URL = "ui://mfvz4q8ktu966u";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComponentChapterPic";
@@ -56,10 +57,12 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_pic = (GLoader)comp.GetChild("pic");
+            m_bg = (GLoader)comp.GetChild("bg");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_pic = null;
+            m_bg = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentListChapterItem.cs

@@ -9,11 +9,13 @@ namespace UI.Main
         public GComponent target;
         public UI_ComponentChapterPic m_compPic;
         public GTextField m_txtChapter;
+        public GLoader m_txtBG;
         public GTextField m_txtChapterName0;
         public GTextField m_txtChapterName1;
         public GTextField m_txtChapterName2;
         public GTextField m_txtChapterName3;
         public GTextField m_txtChapterName4;
+        public GLoader m_numBg;
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
         public GImage m_imgLockBg;
@@ -67,11 +69,13 @@ namespace UI.Main
         {
             m_compPic = (UI_ComponentChapterPic)UI_ComponentChapterPic.Create(comp.GetChild("compPic"));
             m_txtChapter = (GTextField)comp.GetChild("txtChapter");
+            m_txtBG = (GLoader)comp.GetChild("txtBG");
             m_txtChapterName0 = (GTextField)comp.GetChild("txtChapterName0");
             m_txtChapterName1 = (GTextField)comp.GetChild("txtChapterName1");
             m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
             m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
             m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
+            m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
             m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
@@ -82,11 +86,13 @@ namespace UI.Main
             m_compPic.Dispose();
             m_compPic = null;
             m_txtChapter = null;
+            m_txtBG = null;
             m_txtChapterName0 = null;
             m_txtChapterName1 = null;
             m_txtChapterName2 = null;
             m_txtChapterName3 = null;
             m_txtChapterName4 = null;
+            m_numBg = null;
             m_txtCurProgress = null;
             m_txtMaxProgress = null;
             m_imgLockBg = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryChapterUI.cs

@@ -13,6 +13,7 @@ namespace UI.Main
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GTextField m_txtChapter;
+        public GLoader m_txtBg;
         public GTextField m_txtChapterName0;
         public GTextField m_txtChapterName1;
         public GTextField m_txtChapterName2;
@@ -75,6 +76,7 @@ namespace UI.Main
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_txtChapter = (GTextField)comp.GetChild("txtChapter");
+            m_txtBg = (GLoader)comp.GetChild("txtBg");
             m_txtChapterName0 = (GTextField)comp.GetChild("txtChapterName0");
             m_txtChapterName1 = (GTextField)comp.GetChild("txtChapterName1");
             m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
@@ -94,6 +96,7 @@ namespace UI.Main
             m_btnBack = null;
             m_btnHome = null;
             m_txtChapter = null;
+            m_txtBg = null;
             m_txtChapterName0 = null;
             m_txtChapterName1 = null;
             m_txtChapterName2 = null;

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

@@ -45,6 +45,9 @@ namespace GFGGame
             _ui.m_listType.selectedIndex = 0;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
+            _ui.m_listChapter.scrollPane.onScroll.Add(DoSpecialEffect);//滚动时派发事件
+            
+
         }
 
         protected override void OnShown()
@@ -59,8 +62,11 @@ namespace GFGGame
             _ui.m_listType.selectedIndex = subType;
             _ui.m_listChapter.touchable = false;
             UpdateList();
+            DoSpecialEffect();//初始化调用
             Timers.inst.AddUpdate(CheckGuide);
             _ui.m_openViewAction.Play();
+
+           
         }
 
         protected override void OnHide()
@@ -101,7 +107,7 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
-                ViewManager.Show<StoryChapterView>(chapterID, new object[] { typeof(StoryChapterListView).FullName, new object[] { _ui.m_listType.selectedIndex } });
+                ViewManager.Show<StoryChapterView>(new object[] { chapterID , _ui.m_listType.selectedIndex }, new object[] { typeof(StoryChapterListView).FullName, new object[] { _ui.m_listType.selectedIndex } });
                 this.Hide();
             }
             else
@@ -113,6 +119,36 @@ namespace GFGGame
         private void ListChapterItem(int index, GObject item)
         {
             UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(item);
+            if (subType == 1)
+            {
+                listItem.m_content.m_numBg.url = "ui://Main/zxian_jindu_bg_jy";
+                listItem.m_content.m_txtBG.url = "ui://Main/zxian_chapter_dec_jy";
+                listItem.m_content.m_compPic.m_bg.url = "ui://Main/zxian_chapter_frame_l_jy";
+                listItem.m_content.m_txtChapterName0.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapterName1.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapterName2.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapterName3.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapterName4.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapter.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                //listItem.m_content.m_txtCurProgress.color = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                //listItem.m_content.m_txtMaxProgress.color = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+            }
+            else
+            {
+                listItem.m_content.m_numBg.url = "ui://Main/zxian_jindu_bg";
+                listItem.m_content.m_txtBG.url = "ui://Main/zxian_chapter_dec";
+                listItem.m_content.m_compPic.m_bg.url = "ui://Main/zxian_chapter_frame_l";
+                listItem.m_content.m_txtChapterName0.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapterName1.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapterName2.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapterName3.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapterName4.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapter.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                //listItem.m_content.m_txtCurProgress.color = new Color(0.514f, 0.345f, 0.220f, 1.000f); 
+                //listItem.m_content.m_txtMaxProgress.color = new Color(0.514f, 0.345f, 0.220f, 1.000f);
+
+            }
+            
             // if (index % 2 == 0)
             // {
             //     listItem.m_content.target.y = 102;
@@ -258,5 +294,33 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
         }
+
+        private void DoSpecialEffect()
+        {
+            float listCenter = _ui.m_listChapter.scrollPane.posX + _ui.m_listChapter.viewWidth / 2;
+            float listLeft = _ui.m_listChapter.scrollPane.posX + _ui.m_listChapter.viewWidth / 2; ;
+            //list组件的x值，加上list组件自身宽度的一半，设置为对标的中心x值
+            for (int i = 0; i < _ui.m_listChapter.numChildren; i++)
+            {
+                GObject item = _ui.m_listChapter.GetChildAt(i);
+                float itemCenter = item.x + item.width / 2;//循环列表内元素的中心x值
+                float itemWidth = item.width;//列表元素的宽度
+                float distance = Mathf.Abs(listCenter - itemCenter);
+                if (distance < item.width)
+                {
+                    float distanceRange = 1 + (1 - distance / itemWidth) * 0.25f;//使放大动画有渐进效果
+                    item.SetScale(distanceRange, distanceRange);//设置放大比例
+
+                    
+                }
+                else
+                {
+                    item.SetScale(1.0f, 1.0f);
+                }
+                float distanceX = ((1-(listCenter - itemCenter)) / itemWidth) * 0.05f;//使放大动画有渐进效果
+                item.y = - _ui.m_listChapter.height * distanceX;
+            }
+        }
+
     }
 }

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

@@ -17,6 +17,8 @@ namespace GFGGame
         private GObject _endLevelItem;
         private EffectUI _effectUI1;
         private GComponent _comEff;
+
+        private int currentDifficulty;
         public override void Dispose()
         {
             if (_comEff != null)
@@ -82,7 +84,15 @@ namespace GFGGame
             base.OnShown();
             _ui.target.touchable = false;
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
-            _chapterID = (int)viewData;
+            if ((this.viewData as object[]) != null)
+            {
+                _chapterID = (int)(this.viewData as object[])[0];
+                currentDifficulty = (int)(this.viewData as object[])[1];
+            }
+            else
+            {
+                _chapterID = (int)this.viewData;
+            }
             MainStoryDataManager.currentChapterCfgId = _chapterID;
 
             Timers.inst.StartCoroutine(InitChapter());
@@ -92,6 +102,7 @@ namespace GFGGame
             _ui.target.touchable = true;
 
             Timers.inst.AddUpdate(CheckGuide);
+
         }
 
         protected override void OnHide()
@@ -185,6 +196,39 @@ namespace GFGGame
                         levelItem.m_comDialogBg.m_c1.selectedIndex = Random.Range(0, 10);
 
                     }
+
+                    //根据困难程度选择显示图片
+                    if (currentDifficulty == 1)
+                    {
+                        levelItem.m_loaDialogBg.url = "ui://Main/zxian_btn_jq_jy";
+                        levelItem.m_fightBg.url = "ui://Main/zxian_btn_zd_jy";
+                        levelItem.m_txtFightOrder.text = string.Format("{0}", StringUtil.GetColorText(showId.ToString(), "#E3F8FF"));
+                        levelItem.m_fightIconA.alpha = 0;
+                        levelItem.m_fightIconB.alpha = 0;
+                        _ui.m_txtBg.url = "ui://Main/zxian_chapter_dec_jy";
+                        _ui.m_txtChapterName0.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                        _ui.m_txtChapterName1.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                        _ui.m_txtChapterName2.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                        _ui.m_txtChapterName3.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                        _ui.m_txtChapterName4.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                        _ui.m_txtChapter.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                    }
+                    else
+                    {
+                        levelItem.m_loaDialogBg.url = "ui://Main/zxian_btn_jq";
+                        levelItem.m_fightBg.url = "ui://Main/zxian_btn_zd";
+                        levelItem.m_txtFightOrder.text = string.Format("{0}", StringUtil.GetColorText(showId.ToString(), "#FFEABF"));
+                        levelItem.m_fightIconA.alpha = 0;
+                        levelItem.m_fightIconB.alpha = 0;
+                        _ui.m_txtBg.url = "ui://Main/zxian_chapter_dec";
+                        _ui.m_txtChapterName0.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                        _ui.m_txtChapterName1.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                        _ui.m_txtChapterName2.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                        _ui.m_txtChapterName3.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                        _ui.m_txtChapterName4.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                        _ui.m_txtChapter.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                    }
+
                     levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
                     if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
                     {