From 7679f85af3b9b9f79372ca2312862b6ec023a44d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 11:08:24 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Map/UI_MainPlayer.prefab | 128 +++++++++++++++--- .../UI/PlayerInfoView/PlayerInfoView.prefab | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 4 +- .../~Lua/Modules/Main/View/MainPlayerView.lua | 16 +-- 4 files changed, 122 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab index f6667b9c7f..6733525470 100644 --- a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab +++ b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab @@ -60,7 +60,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7868520532870301331} m_Father: {fileID: 7615970307446995481} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -143,7 +144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7586917845628614106 RectTransform: m_ObjectHideFlags: 0 @@ -151,16 +152,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3621620809879865289} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} m_Children: [] - m_Father: {fileID: 7615970307446995481} - m_RootOrder: 2 + m_Father: {fileID: 5993955088853526996} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -32.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} m_SizeDelta: {x: 59, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9115302304514649136 @@ -332,7 +333,6 @@ RectTransform: m_Children: - {fileID: 8542266226903761540} - {fileID: 5993955088853526996} - - {fileID: 7586917845628614106} m_Father: {fileID: 6947002124225122056} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -452,6 +452,101 @@ RectTransform: m_AnchoredPosition: {x: 283, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8136241361327276901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7868520532870301331} + - component: {fileID: 8659842356983684918} + - component: {fileID: 1432783152129603294} + - component: {fileID: 1289954329682749125} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7868520532870301331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} + m_Children: [] + m_Father: {fileID: 8542266226903761540} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} + m_SizeDelta: {x: 59, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8659842356983684918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_CullTransparentMesh: 0 +--- !u!114 &1432783152129603294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: b47ba13ec7c5df340aa580bb5505abac, type: 3} + 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!114 &1289954329682749125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &9071092462066928365 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +565,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5993955088853526996 RectTransform: m_ObjectHideFlags: 0 @@ -481,14 +576,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7586917845628614106} m_Father: {fileID: 7615970307446995481} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 630, y: -35} - m_SizeDelta: {x: 420, y: 66} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 630, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3764668692912066610 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index ad98be8423..583048d3a0 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -6152,7 +6152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 393, y: -33} + m_AnchoredPosition: {x: 440, y: -33} m_SizeDelta: {x: 137.2, y: 52.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8833716866223761799 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fcd9645558..30af02ce28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -334,8 +334,8 @@ function this:BindEvent() -- LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel)) local _lv = NPCList[i].lv or NPCList[i].level or NPCList[i].userLevel if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then - view.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(view.ImprintImg,NPCList[i].practiceLevel) + view.ImprintImg2:SetActive(true) + PracticeManager.SetPracticeIcon(view.ImprintImg2,NPCList[i].practiceLevel) end view:SetAutoMove() view.leader.transform.name = "MainPlayerView"..i diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 7d00286dd9..07e0e0e566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -17,8 +17,11 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) instance.leader.transform:SetParent(root.transform) instance.leader.transform.localPosition = Vector3.zero instance.leader.transform.localScale = Vector3.one - instance.ImprintImg = Util.GetGameObject(instance.leader, "name/Icon")--:GetComponent("Image")--修行标识 - instance.ImprintImg:SetActive(false) + + instance.ImprintImg1 = Util.GetGameObject(instance.leader, "name/text/Icon")--修行标识 + instance.ImprintImg2 = Util.GetGameObject(instance.leader, "name/text2/Icon")--修行标识 + instance.ImprintImg1:SetActive(false) + instance.ImprintImg2:SetActive(false) local _sex, npc, scale if isSelf then @@ -35,19 +38,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) end --如果修行开启设置修行标识 if ActTimeCtrlManager.SingleFuncState(108) then - instance.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(instance.ImprintImg,PracticeManager.PracticeLevel) + instance.ImprintImg1:SetActive(true) + PracticeManager.SetPracticeIcon(instance.ImprintImg1,PracticeManager.PracticeLevel) end else instance.NameText = Util.GetGameObject(instance.leader, "name/text2"):GetComponent("Text") Util.GetGameObject(instance.leader, "name/text"):SetActive(false) Util.GetGameObject(instance.leader, "name/text2"):SetActive(true) _sex = _NpvData.sex - -- --如果修行开启设置修行标识 - -- if _NpvData.lv and _NpvData.lv >= GlobalSysConfig[108].OpenRules[2] then - -- instance.ImprintImg:SetActive(true) - -- PracticeManager.SetPracticeIcon(instance.ImprintImg,_NpvData.practiceLevel) - -- end if _sex == 0 then zuoqi = 80008 end local PlayerLiveViewData = { skin = _NpvData.userSkin, From dbcaf8e5cac2cc78e0f56bb6bb218471171eb042 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 2 Jun 2021 11:25:06 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E8=B8=8F=E7=A2=8E=E5=87=8C=E9=9C=84=E7=A7=B0=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fx_ui_tasuilingxiao_caihongbanyuan.mat | 2 +- .../UI_Effect_MianBan_ChengHao_Tslx.prefab | 77 ++++++++++++++++++- .../Chenghao_TaSuiLingXiao/Prefab/tslx.prefab | 48 ++++++------ .../Textures/fx_tex_caihongbanyuan.png.meta | 17 +++- 4 files changed, 115 insertions(+), 29 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat index 2723b6124e..32bd86a1a1 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Materials/fx_ui_tasuilingxiao_caihongbanyuan.mat @@ -26,4 +26,4 @@ Material: m_Floats: - _InvFade: 1 m_Colors: - - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _TintColor: {r: 0.6226415, g: 0.5012328, b: 0.23202206, a: 0.5019608} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab index 06dc06b00c..bdefe58b4a 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/UI_Effect_MianBan_ChengHao_Tslx.prefab @@ -148,6 +148,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1399205022525211762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8018801407814597797} + - component: {fileID: 6436426854285322771} + - component: {fileID: 8871751318743663811} + m_Layer: 5 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8018801407814597797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: [] + m_Father: {fileID: 6361193509961736898} + 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: 0, y: 57} + m_SizeDelta: {x: 512, y: 512} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6436426854285322771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + m_CullTransparentMesh: 0 +--- !u!114 &8871751318743663811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399205022525211762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: e58858f1b1ab3a7458d9d47baf18a9fa, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 21300000, guid: db22a7aa0cabda647bc0284b80246bb8, type: 3} + 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 &1606432551381439893 GameObject: m_ObjectHideFlags: 0 @@ -478,6 +552,7 @@ RectTransform: - {fileID: 5367728379246610282} - {fileID: 5894301615642667041} - {fileID: 7610283183577423566} + - {fileID: 8018801407814597797} - {fileID: 5531222548493163716} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1061,7 +1136,7 @@ PrefabInstance: - target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e, type: 3} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab index 38158bceb1..092cc93434 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Prefab/tslx.prefab @@ -4652,7 +4652,7 @@ ParticleSystem: --- !u!199 &1502086534190128304 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9417,7 +9417,7 @@ ParticleSystem: --- !u!199 &1502086534398472809 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14183,7 +14183,7 @@ ParticleSystem: --- !u!199 &1502086534435668158 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -18948,7 +18948,7 @@ ParticleSystem: --- !u!199 &1502086534450209971 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23713,7 +23713,7 @@ ParticleSystem: --- !u!199 &1502086534619458174 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28478,7 +28478,7 @@ ParticleSystem: --- !u!199 &1502086534741814842 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33244,7 +33244,7 @@ ParticleSystem: --- !u!199 &1502086534848615861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38010,7 +38010,7 @@ ParticleSystem: --- !u!199 &1502086534911569893 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42775,7 +42775,7 @@ ParticleSystem: --- !u!199 &1502086535142922346 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47473,7 +47473,7 @@ ParticleSystem: --- !u!199 &1502086535199694531 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52171,7 +52171,7 @@ ParticleSystem: --- !u!199 &1502086535281454448 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56870,7 +56870,7 @@ ParticleSystem: --- !u!199 &1502086535292549113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61626,7 +61626,7 @@ ParticleSystem: --- !u!199 &1502086535324031562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66382,7 +66382,7 @@ ParticleSystem: --- !u!199 &1502086535355478197 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71147,7 +71147,7 @@ ParticleSystem: --- !u!199 &1502086535674928818 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75913,7 +75913,7 @@ ParticleSystem: --- !u!199 &1502086535719110089 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80611,7 +80611,7 @@ ParticleSystem: --- !u!199 &1502086535748455003 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85377,7 +85377,7 @@ ParticleSystem: --- !u!199 &1502086535782171297 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90143,7 +90143,7 @@ ParticleSystem: --- !u!199 &1502086535919702147 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94899,7 +94899,7 @@ ParticleSystem: --- !u!199 &1502086535990888684 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94975,7 +94975,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6941918884040322754 Transform: m_ObjectHideFlags: 0 @@ -95073,7 +95073,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.99 minScalar: 1.5 maxCurve: serializedVersion: 2 @@ -96311,7 +96311,7 @@ ParticleSystem: m_RotationOrder: 4 separateAxes: 0 ColorModule: - enabled: 1 + enabled: 0 gradient: serializedVersion: 2 minMaxState: 1 @@ -99655,7 +99655,7 @@ ParticleSystem: --- !u!199 &1088076127499487974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta index c36fad2932..5bda25fc92 100644 --- a/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta +++ b/Assets/ManagedResources/EffectResUI/Chenghao_TaSuiLingXiao/Textures/fx_tex_caihongbanyuan.png.meta @@ -34,8 +34,8 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 nPOTScale: 0 lightmap: 0 @@ -51,7 +51,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] From ba04ea8e7129803cddcb5c48340e715bd8a497c3 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Jun 2021 11:29:26 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=3D=3D=3D=3D=E4=BF=AE=E6=94=B9=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BF=85=E5=BE=97=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E6=AC=A1=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Battle/Logic/Misc/BattleDefine.lua | 1 + .../DynamicActivity/TimeLimitUpHero.lua | 25 +++++++++---------- .../View/GeneralBigPopup_RecrutDetail.lua | 8 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index fcab345054..cbc5735773 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -167,6 +167,7 @@ BattleEventName = { RoleBeExile = indexAdd(),--角色被放逐 RoleExileEnd = indexAdd(),--角色放逐结束 RoleAddBuffFail = indexAdd(),--角色添加buff失败 + RecordRageChange = indexAdd(), -- 怒气改变时 } BattleMaxFrame = 1000000 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 67da1ba79f..cfb31a1711 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -174,7 +174,19 @@ function TimeLimitUpHero:RefreshHeroData() end lastLiveName=GetResourcePath(curConfig.Live) heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar) + local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId) + local totalTimes = 0 + for i = 1, #wishConfig.UpList do + if wishConfig.UpList[i][1]==curHeroId then + totalTimes=wishConfig.UpList[i][4] + end + end + reMaintimes = totalTimes - reMaintimes + if reMaintimes <= 0 then + reMaintimes = 1 + end + self.callTimeTxt.text=reMaintimes end local freeTime = 0 @@ -249,19 +261,6 @@ function TimeLimitUpHero:RefreshGetHeroTimes() end Util.AddOnceClick(m.btn,sureFunc) end - local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId) - local totalTimes = 0 - for i = 1, #wishConfig.UpList do - if wishConfig.UpList[i][1]==curHeroId then - totalTimes=wishConfig.UpList[i][4] - end - end - reMaintimes = totalTimes - reMaintimes - if reMaintimes == 0 then - reMaintimes = totalTimes - end - - self.callTimeTxt.text=reMaintimes end function TimeLimitUpHero:Recruit(actId,type,itemId) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index be5bf46762..b88524fac6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -123,7 +123,7 @@ function this:ShowUpItem(config,actId) end end hero:OnOpen(false,{config.Id,1},1.1,true) - hero.name:GetComponent("Text").text=""..string.format("%.2f", (num/100000)*100) .."%" + hero.name:GetComponent("Text").text=""..string.format("%.2f", 5 ).."%" hero.gameObject:SetActive(true) for k,v in ipairs(this.ratePreList) do @@ -134,11 +134,11 @@ function this:ShowUpItem(config,actId) -- return a.GetRate>b.GetRate -- end) local rateList={} - local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1} + local hero={tag="5星神将UP",name=config.ReadingName,value=0.05,Color=1} for key, value in ConfigPairs(pool) do local id=value.ItemId[1] local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id) - local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0,sort=value.Sort} + local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.FakeRate,Color=0,sort=value.Sort} table.insert(rateList,data) end table.sort(rateList,function(a,b) @@ -165,7 +165,7 @@ function this:ShowUpItem(config,actId) this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1) end this.ratePreList[n].name.text=m.name - this.ratePreList[n].rate.text=string.format((m.value/100000)*100).."%" + this.ratePreList[n].rate.text=(m.value*100).."%" end end From 61f516f9916ce9138735bcae66b3ee930cfdd95d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 11:34:11 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=81=E7=A0=B4=E6=88=90=E5=8A=9F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Practice/PracticeManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index cc97afa832..0aa12efa8f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -397,6 +397,7 @@ end function this.ShowTipsOnUpgrade() local prosData = XiuXianConfig[this.PracticeLevel].TotalPros if prosData then + PopupTipPanel.ShowTip("突破成功!") AttriTips.ShowAttriTip(prosData) end end From 548f3f9f0092d9aaee1913fa5f293754a0fe4f5d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 2 Jun 2021 14:32:16 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=81=E5=8C=85=E7=A7=B0=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 1 + Assets/ManagedResources/~Lua/View/PlayerTitle.lua | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index f218d144fd..3a06257f24 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -13,6 +13,7 @@ ServerConfigManager.SettingConfig = { NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号 PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号 SPRITE_LOADER = "SPRITE_LOADER", -- 资源加载器是否可以使用 + IS_TITLE_EFFECT_SCALE = "IS_TITLE_EFFECT_SCALE", -- 判断 } diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index 58be8c00c5..eb0e343860 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -1,6 +1,7 @@ PlayerTitle = {} local this=PlayerTitle local mapNpcOp = "PlayerTitle" +local isScaleActive = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_TITLE_EFFECT_SCALE) function PlayerTitle:New(gameObject) local b = {} @@ -74,8 +75,10 @@ function PlayerTitle:SetScale(scale) end function PlayerTitle:SetEffectScale(effectScale) - if self.titleLive then - Util.SetParticleScale(self.titleLive, effectScale) + if isScaleActive then + if self.titleLive then + Util.SetParticleScale(self.titleLive, effectScale) + end end end From 4eea852340c8bc89bf31d09ff1f12a204f04f108 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 2 Jun 2021 14:34:51 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E7=95=8C=E9=9D=A2=E7=A7=B0=E5=8F=B7?= =?UTF-8?q?=E5=81=B6=E7=8E=B0=E6=B2=A1=E6=9C=89=E7=89=B9=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=81=8A=E5=A4=A9=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=A7=B0=E5=8F=B7=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Chat/ChatPanel.lua | 69 +++++++------------ .../~Lua/Modules/Main/MainPanel.lua | 2 +- 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 9cda803a3e..9b5c35086b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -16,6 +16,8 @@ local _TabData = { } -- 当前所在的聊天通道 this._CurChannel = 1 +-- 称号 +local titleList={} --初始化组件(用于子类重写) function ChatPanel:InitComponent() @@ -91,6 +93,14 @@ end function ChatPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Chat.OnChatDataChanged, this.OnChatDataChanged) end + +function ChatPanel:OnSortingOrderChange() + if titleList then + for node, playerTitle in pairs(titleList) do + playerTitle:SetLayer(this.sortingOrder) + end + end +end --界面打开时调用(用于子类重写) function ChatPanel:OnOpen(...) -- 参数保存 @@ -142,6 +152,14 @@ function ChatPanel:OnDestroy() ClearRedPointObject(v.rpType) end end + + + if titleList then + for node, playerTitle in pairs(titleList) do + SubUIManager.Close(playerTitle) + end + end + titleList = {} end -- tab节点自定义设置 @@ -312,8 +330,6 @@ function this.GetScrollView(index) end end -local titleList={} -local titleStrList={} -- 好友节点数据匹配 function this.FriendItemAdapter(node, data) -- 获取节点 @@ -333,30 +349,14 @@ function this.FriendItemAdapter(node, data) head.sprite = GetPlayerHeadSprite(this.spLoader, fdata.head) frame.sprite = GetPlayerHeadFrameSprite(this.spLoader, fdata.frame) redpot:SetActive(FriendChatManager.IsFriendNewChat(data.friendId)) - - if titleList[node] then - poolManager:UnLoadAsset(titleStrList[node],titleList[node], PoolManager.AssetType.GameObject) - titleStrList[node] = nil - titleList[node] = nil - end - local title=fdata.userTitle - if title and title>0 then + local title = fdata.userTitle + if title and title > 0 then titlePar:SetActive(true) - local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title) - local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) - local titleLiveStr = curArtResourcesConfig.Name - local titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) - titleLive.transform:SetParent(titlePar.transform) - titleLive.transform.localPosition = Vector3.New(0,0,0) - titleLive.transform.localScale = Vector3.New(0.4,0.4,0.4) - local sortingorder=0 - if this.sortingOrder then - Util.SetParticleSortLayer(titleLive,this.sortingOrder) - -- sortingorder = this.sortingOrder + if not titleList[node] then + titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform) end - titleStrList[node]=titleLiveStr - titleList[node]=titleLive + titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder) else titlePar:SetActive(false) end @@ -442,13 +442,6 @@ function this.ChatItemAdapter(node, data, isShowTime) timeLab.text = TimeStampToDateStr(tonumber(data.times)/1000) end - if titleList[node] then - poolManager:UnLoadAsset(titleStrList[node],titleList[node], PoolManager.AssetType.GameObject) - titleStrList[node] = nil - titleList[node] = nil - end - - local contentStr = "" if this._CurChannel == CHAT_CHANNEL.GLOBAL then local chat = ChatManager.AnalysisGlobalChat(data.msg) @@ -531,20 +524,10 @@ function this.ChatItemAdapter(node, data, isShowTime) end if title and title>0 then titlePar:SetActive(true) - local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title) - local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) - local titleLiveStr = curArtResourcesConfig.Name - local titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject) - titleLive.transform:SetParent(titlePar.transform) - titleLive.transform.localPosition = Vector3.New(0,0,0) - titleLive.transform.localScale = Vector3.New(0.4,0.4,0.4) - local sortingorder=0 - if this.sortingOrder then - Util.SetParticleSortLayer(titleLive,this.sortingOrder) - -- sortingorder = this.sortingOrder + if not titleList[node] then + titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform) end - titleStrList[node]=titleLiveStr - titleList[node]=titleLive + titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder) else titlePar:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 30af02ce28..755a144146 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -691,7 +691,7 @@ function this:OnSortingOrderChange() Util.GetGameObject(self.sceneTran.gameObject, "layer7"):GetComponent("Canvas").sortingOrder = self.sortingOrder - 3 this.npcRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 2 this.decorateRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 1 - Util.AddParticleSortLayer(this.btnClickMove, self.sortingOrder - orginLayer) + -- Util.AddParticleSortLayer(this.btnClickMove, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.sceneTran.gameObject, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.mountainTran.gameObject, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(Util.GetGameObject(this.decorateRoot, "effect"), self.sortingOrder - orginLayer) From 8ccafd974e527493924a90361cd87380fb4d9180 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 2 Jun 2021 14:34:59 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5?= =?UTF-8?q?=E3=80=91=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 6491f345a1..ded543b5cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -100,7 +100,7 @@ function HongMengEnvoyPanel:BindEvent() self.UnShowText:SetActive(true) self.UpBtnRedPoint:SetActive(false) end - self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) + self.GradeText.text = "鸿蒙碑等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) for i = 1, #self.EnvoyItemList do self.EnvoyItemList[i]:UpdateFun() end @@ -256,7 +256,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId) local sum = HarmonyManager:HongMengTowerUpLimit() - self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) + self.GradeText.text = "鸿蒙碑等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) self:IsUpBtnGray() self:InitTextMum() self:CheckEvoyEquip() From 6d41cde054f83c213d1d106f32142700a585e016 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Jun 2021 14:47:54 +0800 Subject: [PATCH 08/12] =?UTF-8?q?[=E7=A7=B0=E5=8F=B7]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E7=A7=B0=E5=8F=B7=E6=97=A0=E6=B3=95=E5=8D=B8=E4=B8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=A7=B0=E5=8F=B7=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua | 2 +- .../~Lua/Modules/Setting/SettingPlayerTitle.lua | 2 +- Assets/ManagedResources/~Lua/View/PlayerLiveView.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 07e0e0e566..2c58a4025c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -61,7 +61,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder) end -- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil) - instance.NpcGO:SetNameHeight(1.5) + instance.NpcGO:SetNameHeight(3) instance.NpcGO:OnOpen() instance.NameText.text = PlayerManager.nickName instance.rect = rect diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua index 3692940c2b..4963f90646 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua @@ -222,7 +222,7 @@ function this.SingleRideClickShowInfo(data,go) PopupTipPanel.ShowTip(Language[12317]) end) elseif isGet and isUser then - NetManager.RequestChangeModifyDecoration(2,curPlayerHeadIconConfig.Id,function() + NetManager.RequestChangeModifyDecoration(2,0,function() PlayerManager.SetPlayerDesignation(0) this.ShowPanelData() PlayerManager.SetisRefreshMainPanelNpc(true) diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 82a1ed24a4..3690389581 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -159,7 +159,7 @@ function PlayerLiveView:OnShowLive() local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,self.PlayerLiveViewData.designation) local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName) local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale) - local y=curArtResourcesConfig.Position[2]+self.nameHeight + local y=curArtResourcesConfig.Position[2]+curPlayerRole.Height if isRide then y=y+3 end From e1145deced711798ff7bff252bb36fd9cad49104 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 14:50:18 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E3=80=90=E7=8E=89=E7=9A=87=E5=A4=A7?= =?UTF-8?q?=E5=B8=9D=E5=85=A5=E5=8F=A3=E3=80=91=E5=A6=82=E6=9E=9C=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E5=AE=8C=E6=88=90=E9=95=BF=E7=A4=BC=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/MainPanel.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 30af02ce28..71baa29281 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -728,7 +728,18 @@ end function this.CheckSixStarGoShow() local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0) if time and time~=0 and time~=666 and GetTimeStamp()-time< 259200 then - this.btnSixStarGo:SetActive(true) + for _, shopData in ipairs(ShopManager.allShopData) do + if shopData.id == 20 then + for _, v in ipairs(shopData.storeItem) do + local time = shopItemConfig[v.id].Limit - v.buyNum + if time > 0 then + this.btnSixStarGo:SetActive(true) + return + end + end + end + end + this.btnSixStarGo:SetActive(false) else this.btnSixStarGo:SetActive(false) end From a6c7de81519445bcca91e6a66f524bdb8d459e0f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 14:56:09 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E3=80=90=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=88=90=E9=95=BF=E7=A4=BC=E5=8C=85=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 992bd57e02..90e31b04fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -732,14 +732,14 @@ function this.CheckSixStarGoShow() if shopData.id == 20 then for _, v in ipairs(shopData.storeItem) do local time = shopItemConfig[v.id].Limit - v.buyNum - if time > 0 then - this.btnSixStarGo:SetActive(true) + if time == 0 then + this.btnSixStarGo:SetActive(false) return end end end end - this.btnSixStarGo:SetActive(false) + this.btnSixStarGo:SetActive(true) else this.btnSixStarGo:SetActive(false) end From 592fad463dcad6ec522f2e39e7df41c8f445de7b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 15:12:44 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E3=80=90=E7=8E=89=E7=9A=87=E5=A4=A7?= =?UTF-8?q?=E5=B8=9D=E3=80=91=E5=85=A5=E5=8F=A3=E9=A1=AF=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 11 ----------- .../~Lua/Modules/Recharge/View/GiftPre.lua | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 90e31b04fb..f281b9ea10 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -728,17 +728,6 @@ end function this.CheckSixStarGoShow() local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0) if time and time~=0 and time~=666 and GetTimeStamp()-time< 259200 then - for _, shopData in ipairs(ShopManager.allShopData) do - if shopData.id == 20 then - for _, v in ipairs(shopData.storeItem) do - local time = shopItemConfig[v.id].Limit - v.buyNum - if time == 0 then - this.btnSixStarGo:SetActive(false) - return - end - end - end - end this.btnSixStarGo:SetActive(true) else this.btnSixStarGo:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index c28ea02293..0b363966bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -132,7 +132,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId) self.parent:RefreshData(nil,false,false) CheckRedPointStatus(RedPointType.DailyGift) CheckRedPointStatus(RedPointType.GrowthPackage) - if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1112 )then + if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1108 )then PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666) end end) From 24800d9f27f66fcd63737828fe19f7acac40f482 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 2 Jun 2021 15:27:02 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=B0=E5=8F=B7=E5=A4=A7=E5=B0=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AssetBundles/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AssetBundles/config.txt b/AssetBundles/config.txt index fdc1d41d93..09a798b511 100644 --- a/AssetBundles/config.txt +++ b/AssetBundles/config.txt @@ -1 +1 @@ -{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file +{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file