修改剧情UI

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

@@ -7,13 +7,13 @@ namespace UI.Main
     public partial class UI_CompDialogHead
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_bg;
         public GTextField m_txtName;
         public UI_Component1 m_compDressUp;
         public UI_ComponentHead m_comphead;
         public GTextField m_txtContent;
         public UI_CompArrow m_iconNext;
-        public const string URL = "ui://mfvz4q8knmnb31";
+        public const string URL = "ui://mfvz4q8kuftz9fvc";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompDialogHead";
         private static UI_CompDialogHead _proxy;
@@ -60,7 +60,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_bg = (GLoader)comp.GetChild("bg");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_compDressUp = (UI_Component1)UI_Component1.Create(comp.GetChild("compDressUp"));
             m_comphead = (UI_ComponentHead)UI_ComponentHead.Create(comp.GetChild("comphead"));

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_CompDialogHead_old
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GTextField m_txtName;
+        public UI_Component1 m_compDressUp;
+        public UI_ComponentHead m_comphead;
+        public GTextField m_txtContent;
+        public UI_CompArrow m_iconNext;
+        public const string URL = "ui://mfvz4q8knmnb31";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "CompDialogHead_old";
+        private static UI_CompDialogHead_old _proxy;
+
+        public static UI_CompDialogHead_old Create(GObject gObject = null)
+        {
+            var ui = new UI_CompDialogHead_old();
+            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_CompDialogHead_old Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompDialogHead_old();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_compDressUp = (UI_Component1)UI_Component1.Create(comp.GetChild("compDressUp"));
+            m_comphead = (UI_ComponentHead)UI_ComponentHead.Create(comp.GetChild("comphead"));
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_iconNext = (UI_CompArrow)UI_CompArrow.Create(comp.GetChild("iconNext"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtName = null;
+            m_compDressUp.Dispose();
+            m_compDressUp = null;
+            m_comphead.Dispose();
+            m_comphead = null;
+            m_txtContent = null;
+            m_iconNext.Dispose();
+            m_iconNext = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -13,8 +13,8 @@ namespace UI.Main
         public GTextField m_txtContent;
         public UI_CompArrow m_iconNext;
         public GTextField m_txtName;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8knmnb30";
+        public Transition m_In;
+        public const string URL = "ui://mfvz4q8kuftz9fvf";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompDialogName";
         private static UI_CompDialogName _proxy;
@@ -67,7 +67,7 @@ namespace UI.Main
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_iconNext = (UI_CompArrow)UI_CompArrow.Create(comp.GetChild("iconNext"));
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_t0 = comp.GetTransition("t0");
+            m_In = comp.GetTransition("In");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,7 +78,7 @@ namespace UI.Main
             m_iconNext.Dispose();
             m_iconNext = null;
             m_txtName = null;
-            m_t0 = null;
+            m_In = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,12 +13,13 @@ namespace UI.Main
         public UI_CompDialogText m_dialogText;
         public UI_CompDialogName m_dialogName;
         public UI_CompDialogHead m_dialogHead;
+        public UI_CompDialogHead_old m_dialogHead_old;
         public GList m_list;
         public GButton m_btnBack;
-        public GButton m_btnLookBack;
-        public GButton m_btnAutoPlay;
-        public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
+        public GButton m_btnSpeedUp;
+        public GButton m_btnAutoPlay;
+        public GButton m_btnLookBack;
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
         public Transition m_t0;
@@ -75,12 +76,13 @@ namespace UI.Main
             m_dialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("dialogText"));
             m_dialogName = (UI_CompDialogName)UI_CompDialogName.Create(comp.GetChild("dialogName"));
             m_dialogHead = (UI_CompDialogHead)UI_CompDialogHead.Create(comp.GetChild("dialogHead"));
+            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_btnAutoPlay = (GButton)comp.GetChild("btnAutoPlay");
-            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             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_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
             m_t0 = comp.GetTransition("t0");
@@ -96,12 +98,14 @@ namespace UI.Main
             m_dialogName = null;
             m_dialogHead.Dispose();
             m_dialogHead = null;
+            m_dialogHead_old.Dispose();
+            m_dialogHead_old = null;
             m_list = null;
             m_btnBack = null;
-            m_btnLookBack = null;
-            m_btnAutoPlay = null;
-            m_btnSpeedUp = null;
             m_btnSkip = null;
+            m_btnSpeedUp = null;
+            m_btnAutoPlay = null;
+            m_btnLookBack = null;
             m_txtPlayName = null;
             m_comPlayName = null;
             m_t0 = null;

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

@@ -591,7 +591,7 @@ namespace GFGGame
 
         private void ShowCurrentWords()
         {
-            _arrow.target.visible = true;
+            //_arrow.target.visible = true;
             //Timers.inst.Remove(UpdateLetters);
             StopTyping();
             _typingEffect?.Cancel();

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 59c23b3e214af1f4b9e6d24d3e259e35
+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_atlas0_10.png.meta

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