From 6c673de50aaff9c2947cf7ca4d591c0723e213c6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 30 Apr 2021 09:50:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=89=A7=E6=83=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Story/StoryMapPanel.lua | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index 1e7883277f..d1619882cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -277,8 +277,12 @@ function this:CheckTrigger(data,go) Util.AddParticleSortLayer(this.UI_Effect_ChuFaEffect_05,newSortingOrder - sortingOrder) this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(true) Timer.New(function() - this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false) - this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true) + if this.UI_Effect_ChuFaEffect_02 then + this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false) + end + if this.UI_Effect_ChuFaEffect_05 then + this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true) + end end,data.groups[1],1,false):Start() Timer.New(function() @@ -288,7 +292,9 @@ function this:CheckTrigger(data,go) end,(data.groups[1] + 0.5),1,false):Start() Timer.New(function() - this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_05 then + this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false) + end this.btnSkipBtnComp.enabled = true this:StackPop() end,(data.groups[1] + 0.5 + 1),1,false):Start() @@ -312,11 +318,15 @@ function this:CheckTrigger(data,go) this.effectBrowList[v].gameObject:SetActive(false) end end + for k,v in pairs(this.effectBrowList) do + Util.AddParticleSortLayer(v,newSortingOrder - sortingOrder) + end local indexTemp = 0 Timer.New(function() indexTemp = indexTemp + 1 - Util.AddParticleSortLayer(this.effectBrowList[tempList[indexTemp]],newSortingOrder - sortingOrder) - this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true) + if this.effectBrowList[tempList[indexTemp]] then + this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true) + end local index = 0 if tempList[indexTemp] < 5 then index = tempList[indexTemp] @@ -341,7 +351,6 @@ function this:CheckTrigger(data,go) for k,v in pairs(this.effectBrowList) do v.gameObject:SetActive(false) end - if not this.UI_Effect_ChuFaEffect_03 then this.UI_Effect_ChuFaEffect_03 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_03", PoolManager.AssetType.GameObject) this.UI_Effect_ChuFaEffect_03.name = "UI_Effect_ChuFaEffect_03" @@ -390,7 +399,9 @@ function this:CheckTrigger(data,go) this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(true) elseif data.eventType == 12 then --光芒四射的特效 --设置上一个特效为false - this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_06 then + this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false) + end --加载光芒四射的特效 if not this.UI_Effect_ChuFaEffect_07 then this.UI_Effect_ChuFaEffect_07 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_07", PoolManager.AssetType.GameObject) @@ -404,8 +415,12 @@ function this:CheckTrigger(data,go) this.eventIndex = 0 this.btnSkipBtnComp.enabled = false Timer.New(function() - this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false) - this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_04 then + this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false) + end + if this.UI_Effect_ChuFaEffect_07 then + this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false) + end this.btnSkipBtnComp.enabled = true this:StackPop() end,data.groups[1],1,false):Start() From b3ca5ee02647a16af09ad0eb664b30c3882bfdc4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 30 Apr 2021 09:50:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=89=A7=E6=83=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6c673de50aaff9c2947cf7ca4d591c0723e213c6) --- .../~Lua/Modules/Story/StoryMapPanel.lua | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index 1e7883277f..d1619882cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -277,8 +277,12 @@ function this:CheckTrigger(data,go) Util.AddParticleSortLayer(this.UI_Effect_ChuFaEffect_05,newSortingOrder - sortingOrder) this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(true) Timer.New(function() - this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false) - this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true) + if this.UI_Effect_ChuFaEffect_02 then + this.UI_Effect_ChuFaEffect_02.gameObject:SetActive(false) + end + if this.UI_Effect_ChuFaEffect_05 then + this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(true) + end end,data.groups[1],1,false):Start() Timer.New(function() @@ -288,7 +292,9 @@ function this:CheckTrigger(data,go) end,(data.groups[1] + 0.5),1,false):Start() Timer.New(function() - this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_05 then + this.UI_Effect_ChuFaEffect_05.gameObject:SetActive(false) + end this.btnSkipBtnComp.enabled = true this:StackPop() end,(data.groups[1] + 0.5 + 1),1,false):Start() @@ -312,11 +318,15 @@ function this:CheckTrigger(data,go) this.effectBrowList[v].gameObject:SetActive(false) end end + for k,v in pairs(this.effectBrowList) do + Util.AddParticleSortLayer(v,newSortingOrder - sortingOrder) + end local indexTemp = 0 Timer.New(function() indexTemp = indexTemp + 1 - Util.AddParticleSortLayer(this.effectBrowList[tempList[indexTemp]],newSortingOrder - sortingOrder) - this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true) + if this.effectBrowList[tempList[indexTemp]] then + this.effectBrowList[tempList[indexTemp]].gameObject:SetActive(true) + end local index = 0 if tempList[indexTemp] < 5 then index = tempList[indexTemp] @@ -341,7 +351,6 @@ function this:CheckTrigger(data,go) for k,v in pairs(this.effectBrowList) do v.gameObject:SetActive(false) end - if not this.UI_Effect_ChuFaEffect_03 then this.UI_Effect_ChuFaEffect_03 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_03", PoolManager.AssetType.GameObject) this.UI_Effect_ChuFaEffect_03.name = "UI_Effect_ChuFaEffect_03" @@ -390,7 +399,9 @@ function this:CheckTrigger(data,go) this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(true) elseif data.eventType == 12 then --光芒四射的特效 --设置上一个特效为false - this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_06 then + this.UI_Effect_ChuFaEffect_06.gameObject:SetActive(false) + end --加载光芒四射的特效 if not this.UI_Effect_ChuFaEffect_07 then this.UI_Effect_ChuFaEffect_07 = poolManager:LoadAsset("UI_Effect_ChuFaEffect_07", PoolManager.AssetType.GameObject) @@ -404,8 +415,12 @@ function this:CheckTrigger(data,go) this.eventIndex = 0 this.btnSkipBtnComp.enabled = false Timer.New(function() - this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false) - this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false) + if this.UI_Effect_ChuFaEffect_04 then + this.UI_Effect_ChuFaEffect_04.gameObject:SetActive(false) + end + if this.UI_Effect_ChuFaEffect_07 then + this.UI_Effect_ChuFaEffect_07.gameObject:SetActive(false) + end this.btnSkipBtnComp.enabled = true this:StackPop() end,data.groups[1],1,false):Start() From d4a0a902bd2836f66be29674a9d094d8d7977770 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 30 Apr 2021 11:17:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=A7=B0=E5=8F=B7=E7=89=B9=E6=95=88=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Chat/ChatPanel.prefab | 150 ++++++++++++++++++ .../PublicArtRes/Materials/chenghao_mat1.mat | 79 +++++++++ .../Materials/chenghao_mat1.mat.meta | 8 + .../PublicArtRes/Materials/chenghao_mat2.mat | 88 ++++++++++ .../Materials/chenghao_mat2.mat.meta | 8 + .../~Lua/Modules/Chat/ChatPanel.lua | 11 +- 6 files changed, 341 insertions(+), 3 deletions(-) create mode 100644 Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat create mode 100644 Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat.meta create mode 100644 Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat create mode 100644 Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat.meta diff --git a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab index 3acb4b4943..8034f624a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab @@ -1879,6 +1879,8 @@ RectTransform: - {fileID: 224496641487165388} - {fileID: 224314219868368952} - {fileID: 224840128425348974} + - {fileID: 1726105179464205488} + - {fileID: 7623883102458573942} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5347,6 +5349,80 @@ RectTransform: m_AnchoredPosition: {x: 421.8, y: 21} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4035182006869693072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7623883102458573942} + - component: {fileID: 3050821877368694045} + - component: {fileID: 7172016855107129751} + m_Layer: 5 + m_Name: Image1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7623883102458573942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035182006869693072} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224197152332357120} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1630.5, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3050821877368694045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035182006869693072} + m_CullTransparentMesh: 0 +--- !u!114 &7172016855107129751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035182006869693072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 690377177e4787b46b1a8d22001d52f0, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4925031386345304769 GameObject: m_ObjectHideFlags: 0 @@ -7804,6 +7880,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6932840096574000735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1726105179464205488} + - component: {fileID: 2423732021818712883} + - component: {fileID: 1883381040914973284} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1726105179464205488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932840096574000735} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224197152332357120} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1630.5, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2423732021818712883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932840096574000735} + m_CullTransparentMesh: 0 +--- !u!114 &1883381040914973284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932840096574000735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 2c75a8c8c4e0e36498f0f80aeb2275f5, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8174434967246760697 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat new file mode 100644 index 0000000000..ed4743a82b --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chenghao_mat1 + m_Shader: {fileID: 4800000, guid: 8b8b2e19260ad614e9bac0ab7bf1e43c, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat.meta b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat.meta new file mode 100644 index 0000000000..ff798cfb75 --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c75a8c8c4e0e36498f0f80aeb2275f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat new file mode 100644 index 0000000000..daae4c5ad8 --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chenghao_mat2 + m_Shader: {fileID: 4800000, guid: 4bb8e7d80962b9547ad00d7ec8809496, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Tex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _U: 0.2 + - _UVSec: 0 + - _V: 0.7 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color_wai: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat.meta b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat.meta new file mode 100644 index 0000000000..d92778a58e --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 690377177e4787b46b1a8d22001d52f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index f8d5154c65..1bc724f51c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -42,7 +42,8 @@ function ChatPanel:InitComponent() this.playerPower = Util.GetGameObject(this.playerBg, "power"):GetComponent("Text") this.playerInvite = Util.GetGameObject(this.playerBg, "btnInvite") this.playerFriend = Util.GetGameObject(this.playerBg, "btnFriend") - + this.shader1 = Util.GetGameObject(self.gameObject, "Image"):GetComponent("Image").material.shader + this.shader2 = Util.GetGameObject(self.gameObject, "Image1"):GetComponent("Image").material.shader -- 上部货币显示 this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft}) end @@ -248,11 +249,15 @@ function this.RefreshShow(isForceBottom) local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) for key, value in pairs(particles:ToTable()) do local mat=value:GetComponent(typeof(UnityEngine.Renderer)) - mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1") + -- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1") + mat.material.shader=this.shader1 + --mat.material= resMgr:LoadAsset("chenghao_mat1") end local meshs=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer)) for key, value in pairs(meshs:ToTable()) do - value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1") + -- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1") + --value.material= resMgr:LoadAsset("chenghao_mat2") + value.material.shader=this.shader2 end end, _GoToIndex) From 72ab9438d166a66a3779e96b6e3bf64b0edc6058 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 30 Apr 2021 11:22:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AA=81=E7=A0=B4=E7=AC=AC=E4=B8=80=E7=AB=A0?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E5=85=B3=E8=BF=9B=E5=85=A5=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=AB=A0=E6=97=B6=EF=BC=8C=E5=88=87=E6=8D=A2=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=87=BA=E7=8E=B0=E9=BB=91=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index f3df9add5e..33d9be3384 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -375,7 +375,7 @@ function SingleFightPlayerView:RoleMove(pathList) self.roleCurPos = data local speed = 0.5 self.gameObject.transform:DOLocalMove(Vector3(v3.x, v3.y, v3.z - 10), speed, false):OnStart(function () end):OnUpdate(function() --TODO:测试速度 - if self.isSelf then + if self.isSelf and not self.isclose then self:PlayStepSound() local v4 = self.gameObject.transform.localPosition v4.z = TileMapView.ViewCameraPos.z From de827b3ae3216b6a7a8405819604ec722ddf9294 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 30 Apr 2021 11:29:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E8=87=B3=E5=B0=8A=E9=99=8D?= =?UTF-8?q?=E4=B8=96=E3=80=91=E5=BB=B6=E6=97=B6=E5=9B=9B=E7=A7=92=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E5=85=B3=E9=97=AD=E7=95=8C=E9=9D=A2=E5=90=A6?= =?UTF-8?q?=E5=88=99=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=AB=8B=E7=BB=98=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 903efd5a89..0a30d716e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -197,7 +197,7 @@ function this.InitShowPanel() this.effectTime = nil this.effectTime = Timer.New(function () canClose = true - end, 1.2) + end, 4) this.effectTime:Start() end