瀏覽代碼

修改剧情UI

leiyasi 1 年之前
父節點
當前提交
e62967bcb8

+ 18 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -9,6 +9,8 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaMask;
+        public GGraph m_mask1;
+        public GGraph m_mask2;
         public GGraph m_btnNext;
         public UI_CompDialogText m_dialogText;
         public UI_CompDialogName m_dialogName;
@@ -16,16 +18,18 @@ namespace UI.Main
         public UI_CompDialogHead_old m_dialogHead_old;
         public GList m_list;
         public GButton m_btnBack;
+        public GButton m_btnLookBack;
         public GButton m_btnSkip;
-        public GButton m_btnSpeedUp;
         public GButton m_btnAutoPlay;
-        public GButton m_btnLookBack;
+        public GButton m_btnSpeedUp;
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
         public Transition m_t0;
         public Transition m_showMask;
         public Transition m_hideMask;
         public Transition m_hide;
+        public Transition m_showAnimMask;
+        public Transition m_hideAnimMask;
         public const string URL = "ui://mfvz4q8kxuzk2i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryDialogUI";
@@ -75,6 +79,8 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_loaMask = (GLoader)comp.GetChild("loaMask");
+            m_mask1 = (GGraph)comp.GetChild("mask1");
+            m_mask2 = (GGraph)comp.GetChild("mask2");
             m_btnNext = (GGraph)comp.GetChild("btnNext");
             m_dialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("dialogText"));
             m_dialogName = (UI_CompDialogName)UI_CompDialogName.Create(comp.GetChild("dialogName"));
@@ -82,21 +88,25 @@ namespace UI.Main
             m_dialogHead_old = (UI_CompDialogHead_old)UI_CompDialogHead_old.Create(comp.GetChild("dialogHead_old"));
             m_list = (GList)comp.GetChild("list");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnLookBack = (GButton)comp.GetChild("btnLookBack");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
-            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnAutoPlay = (GButton)comp.GetChild("btnAutoPlay");
-            m_btnLookBack = (GButton)comp.GetChild("btnLookBack");
+            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
             m_hide = comp.GetTransition("hide");
+            m_showAnimMask = comp.GetTransition("showAnimMask");
+            m_hideAnimMask = comp.GetTransition("hideAnimMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaMask = null;
+            m_mask1 = null;
+            m_mask2 = null;
             m_btnNext = null;
             m_dialogText.Dispose();
             m_dialogText = null;
@@ -108,16 +118,18 @@ namespace UI.Main
             m_dialogHead_old = null;
             m_list = null;
             m_btnBack = null;
+            m_btnLookBack = null;
             m_btnSkip = null;
-            m_btnSpeedUp = null;
             m_btnAutoPlay = null;
-            m_btnLookBack = null;
+            m_btnSpeedUp = null;
             m_txtPlayName = null;
             m_comPlayName = null;
             m_t0 = null;
             m_showMask = null;
             m_hideMask = null;
             m_hide = null;
+            m_showAnimMask = null;
+            m_hideAnimMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -91,6 +91,10 @@ namespace GFGGame
             _ui.m_list.visible = false;
             _ui.m_btnNext.width = GRoot.inst.width;
             _ui.m_btnNext.height = GRoot.inst.height;
+            _ui.m_mask1.height = (GRoot.inst.height - 1920) / 2;
+            _ui.m_mask2.height = (GRoot.inst.height - 1920) / 2;
+            _ui.m_mask1.y = 0;
+            _ui.m_mask2.y = 1920 - _ui.m_mask2.height;
             _ui.m_btnNext.AddRelation(GRoot.inst, RelationType.Size);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
@@ -108,6 +112,7 @@ namespace GFGGame
             MusicManager.Instance.Stop();
             MusicManager.Instance.SetNormalVolumn(0.6f);
             MusicManager.Instance.SetVolume(0);
+            _ui.m_hideAnimMask.Play();
 
             if (_sceneObject == null)
             {
@@ -740,18 +745,22 @@ namespace GFGGame
             {
                 if (value == "0")
                 {
-                    SceneController.ControlBgVisible(_sceneObject, true);
+                    //SceneController.ControlBgVisible(_sceneObject, true);
+                    _ui.m_hideAnimMask.Play();
+
                     SceneController.UpdateDialogAnim(value, ref _animObject);
                 }
                 // 播放动画
                 else
                 {
+
                     StoryDialogDataManager.Instance.waiting = true;
 
                     _ui.m_showMask.Play(() =>
                     {
                         _ui.m_hideMask.Play();
-                        SceneController.ControlBgVisible(_sceneObject, false);
+                        _ui.m_showAnimMask.Play();
+                        //SceneController.ControlBgVisible(_sceneObject, false);
                         SceneController.UpdateDialogAnim(value, ref _animObject);
                     });
                     

二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二進制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes