diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 4ee5738d75..cdbe784cef 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -1,5 +1,170 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &395052110336182665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7837319558304286115} + - component: {fileID: 2224304849929061418} + - component: {fileID: 1587157240035981223} + m_Layer: 0 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7837319558304286115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395052110336182665} + 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: 5743257853158127750} + 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: 225, y: -40} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2224304849929061418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395052110336182665} + m_CullTransparentMesh: 0 +--- !u!114 &1587157240035981223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395052110336182665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\xB7\u5168\u4F53\u795E\u5C06\u751F\u547D+3000" + LanguageIndex: 0 +--- !u!1 &2012665435272925454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7442141385126438634} + - component: {fileID: 3770493636493369945} + - component: {fileID: 2193604983812027278} + - component: {fileID: 7063734788131870574} + m_Layer: 5 + m_Name: GeneralInfoPopup_QiJieGoalAttri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7442141385126438634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012665435272925454} + 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: + - {fileID: 8191012020774304628} + - {fileID: 5743257853158127750} + m_Father: {fileID: 1828482313430278523} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -107.5} + m_SizeDelta: {x: 600, y: 215} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3770493636493369945 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012665435272925454} + m_CullTransparentMesh: 0 +--- !u!114 &2193604983812027278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012665435272925454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 95 + m_Bottom: 20 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &7063734788131870574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012665435272925454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2489753912354302467 GameObject: m_ObjectHideFlags: 0 @@ -86,6 +251,86 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &2988453590738361744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1853757553770120972} + - component: {fileID: 956857184259269487} + - component: {fileID: 5734791432476700341} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1853757553770120972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988453590738361744} + 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: 8191012020774304628} + m_RootOrder: 0 + 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.000015259, y: 0.0000017881} + m_SizeDelta: {x: 197.07, y: 47.75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &956857184259269487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988453590738361744} + m_CullTransparentMesh: 0 +--- !u!114 &5734791432476700341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988453590738361744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28627452, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 41 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 70 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u76EE\u6807\u7279\u6027" + LanguageIndex: 0 --- !u!1 &2992713979510593098 GameObject: m_ObjectHideFlags: 0 @@ -454,6 +699,102 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &5102170010853879747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8191012020774304628} + - component: {fileID: 5416839627974058720} + - component: {fileID: 3821313281440197280} + - component: {fileID: 4857904969518756987} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8191012020774304628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102170010853879747} + 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: + - {fileID: 1853757553770120972} + m_Father: {fileID: 7442141385126438634} + 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: 300, y: -43} + m_SizeDelta: {x: 265.96, y: 54.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5416839627974058720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102170010853879747} + m_CullTransparentMesh: 0 +--- !u!114 &3821313281440197280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102170010853879747} + 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: 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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4857904969518756987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102170010853879747} + 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 &5990311461964822248 GameObject: m_ObjectHideFlags: 0 @@ -1125,6 +1466,7 @@ RectTransform: m_Children: - {fileID: 3052509476415502148} - {fileID: 4319954644975728847} + - {fileID: 7442141385126438634} m_Father: {fileID: 6150816739817875349} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1207,6 +1549,97 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 1 +--- !u!1 &7670559230552919807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5743257853158127750} + - component: {fileID: 7931651749744057525} + - component: {fileID: 5762230958227516854} + - component: {fileID: 1953130429167673892} + m_Layer: 5 + m_Name: AddList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5743257853158127750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670559230552919807} + 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: + - {fileID: 7837319558304286115} + m_Father: {fileID: 7442141385126438634} + 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: 300, y: -145} + m_SizeDelta: {x: 550, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7931651749744057525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670559230552919807} + m_CullTransparentMesh: 0 +--- !u!114 &5762230958227516854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670559230552919807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1953130429167673892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670559230552919807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 100 + m_Right: 0 + m_Top: 0 + m_Bottom: 20 + m_ChildAlignment: 3 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 250, y: 30} + m_Spacing: {x: 30, y: 20} + m_Constraint: 1 + m_ConstraintCount: 1 --- !u!1 &8039350172597770738 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 6f1d32c98c..eb8a1523e0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1719,6 +1719,15 @@ NumToSimplenessFont = { [14] = Language[10014], [15] = Language[10015], } +NumToWeek = { + [1] = "周一", + [2] = "周二", + [3] = "周三", + [4] = "周四", + [5] = "周五", + [6] = "周六", + [7] = "周日", +} -- 世界聊天类型 GLOBAL_CHAT_TYPE = { COMMON = 0, @@ -2134,6 +2143,7 @@ GENERAL_POPUP_TYPE={ GENERALINFO_TYPE = { Imprint = 1,--紫府神印信息 PracticeLevel = 2,--修行界面小点的信息 + QiJieGoalAttri = 3,--七界试炼目标属性 } --通用恭喜界面类型 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua index f2fe32b40e..5a1010313e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua @@ -10,6 +10,8 @@ local contentScripts = { [GENERALINFO_TYPE.Imprint] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint"), panelName = "GeneralInfoPopup_Imprint"}, --修行界面小点的信息 [GENERALINFO_TYPE.PracticeLevel] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel"), panelName = "GeneralInfoPopup_PracticeLevel"}, + --七界试炼目标属性 + [GENERALINFO_TYPE.QiJieGoalAttri] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri"), panelName = "GeneralInfoPopup_QiJieGoalAttri"}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua new file mode 100644 index 0000000000..a9d69bdf6b --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua @@ -0,0 +1,63 @@ +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local QiJieStageBuff = ConfigManager.GetConfig(ConfigName.QijieStageBuff) +--初始化组件(用于子类重写) +function this:InitComponent(gameObject) + this.addList = Util.GetGameObject(gameObject, "AddList") + this.TextPre = Util.GetGameObject(this.addList, "TextPre") + this.addTextList = {} +end + +--绑定事件(用于子类重写) +function this:BindEvent() +end + +--添加事件监听(用于子类重写) +function this:AddListener() +end + +--移除事件监听(用于子类重写) +function this:RemoveListener() +end + +--界面打开时调用(用于子类重写) +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + local _args = {...} + local data = _args[1] + + if not this.addTextList then + this.addTextList = {} + end + for k,v in ipairs(this.addTextList) do + v.gameObject:SetActive(false) + end + for i = 1, #data.Buff do + local attri = data.Buff[i] + if not this.addTextList[i] then + this.addTextList[i] = newObject(this.TextPre) + this.addTextList[i].transform:SetParent(this.addList.transform) + this.addTextList[i].transform.localScale = Vector3.one + this.addTextList[i].transform.localPosition = Vector3.zero + end + this.addTextList[i]:SetActive(true) + local str = QiJieStageBuff[attri].Describe + this.addTextList[i]:GetComponent("Text").text = str + this.addTextList[i]:GetComponent("Text").text = string.format("·%s",str) + end +end + +--界面关闭时调用(用于子类重写) +function this:OnClose() +end + +--界面销毁时调用(用于子类重写) +function this:OnDestroy() + this.addTextList = {} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua.meta new file mode 100644 index 0000000000..7468c603c5 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71d8b514b86ea0445bb075d03c465c5e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index cf508af175..0bd80c2217 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -6,76 +6,75 @@ local this=GeneralPopup --子模块脚本 local contentScripts = { --回溯 - [1] = {view = require("Modules/Popup/View/GeneralPopup_ResolveRecall"), panelName = "GeneralPopup_ResolveRecall",type=GENERAL_POPUP_TYPE.ResolveRecall}, + [GENERAL_POPUP_TYPE.ResolveRecall] = {view = require("Modules/Popup/View/GeneralPopup_ResolveRecall"), panelName = "GeneralPopup_ResolveRecall"}, --献祭 - [2] = {view = require("Modules/Popup/View/GeneralPopup_ResolveDismantle"), panelName = "GeneralPopup_ResolveDismantle",type=GENERAL_POPUP_TYPE.ResolveDismantle}, + [GENERAL_POPUP_TYPE.ResolveDismantle] = {view = require("Modules/Popup/View/GeneralPopup_ResolveDismantle"), panelName = "GeneralPopup_ResolveDismantle"}, --装备合成 - [3]= {view=require("Modules/Popup/View/GeneralPopup_EquipCompound"),panelName="GeneralPopup_EquipCompound",type=GENERAL_POPUP_TYPE.EquipCompound}, + [GENERAL_POPUP_TYPE.EquipCompound]= {view=require("Modules/Popup/View/GeneralPopup_EquipCompound"),panelName="GeneralPopup_EquipCompound"}, --公会技能重置返还 - [4]= {view=require("Modules/Popup/View/GeneralPopup_GuildSkillReset"),panelName="GeneralPopup_GuildSkillReset",type=GENERAL_POPUP_TYPE.GuildSkill}, + [GENERAL_POPUP_TYPE.GuildSkill]= {view=require("Modules/Popup/View/GeneralPopup_GuildSkillReset"),panelName="GeneralPopup_GuildSkillReset"}, --宝物合成 - [5]= {view=require("Modules/Popup/View/GeneralPopup_TreasureCompound"),panelName="GeneralPopup_TreasureCompound",type=GENERAL_POPUP_TYPE.TreasureCompound}, + [GENERAL_POPUP_TYPE.TreasureCompound]= {view=require("Modules/Popup/View/GeneralPopup_TreasureCompound"),panelName="GeneralPopup_TreasureCompound"}, --公会援助发送求助碎片 - [6]= {view=require("Modules/Popup/View/GeneralPopup_GuildAid"),panelName="GeneralPopup_GuildAid",type=GENERAL_POPUP_TYPE.GuildAid}, + [GENERAL_POPUP_TYPE.GuildAid]= {view=require("Modules/Popup/View/GeneralPopup_GuildAid"),panelName="GeneralPopup_GuildAid"}, --公会援助查看宝箱奖励 - [7]= {view=require("Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward"),panelName="GeneralPopup_GuildAidFindBoxReward",type=GENERAL_POPUP_TYPE.GuildAidFindBoxReward}, + [GENERAL_POPUP_TYPE.GuildAidFindBoxReward]= {view=require("Modules/Popup/View/GeneralPopup_GuildAidFindBoxReward"),panelName="GeneralPopup_GuildAidFindBoxReward"}, --点将台抽卡 奖励弹窗 - [8]= {view=require("Modules/Popup/View/GeneralPopup_RecruitBox"),panelName="GeneralPopup_RecruitBox",type=GENERAL_POPUP_TYPE.RecruitBox}, + [GENERAL_POPUP_TYPE.RecruitBox]= {view=require("Modules/Popup/View/GeneralPopup_RecruitBox"),panelName="GeneralPopup_RecruitBox"}, --挂机属性提升 - [9]= {view=require("Modules/Popup/View/GeneralPopup_Onhook"),panelName="GeneralPopup_Onhook",type=GENERAL_POPUP_TYPE.Onhook}, + [GENERAL_POPUP_TYPE.Onhook]= {view=require("Modules/Popup/View/GeneralPopup_Onhook"),panelName="GeneralPopup_Onhook"}, --试练设置弹窗 - [10]={view=require("Modules/Popup/View/GeneralPopup_TrialSetting"),panelName="GeneralPopup_TrialSetting",type=GENERAL_POPUP_TYPE.TrialSetting}, + [GENERAL_POPUP_TYPE.TrialSetting]={view=require("Modules/Popup/View/GeneralPopup_TrialSetting"),panelName="GeneralPopup_TrialSetting"}, --试练回春散 - [11]={view=require("Modules/Popup/View/GeneralPopup_TrialXingYao"),panelName="GeneralPopup_TrialXingYao",type=GENERAL_POPUP_TYPE.TrialXingYao}, + [GENERAL_POPUP_TYPE.TrialXingYao]={view=require("Modules/Popup/View/GeneralPopup_TrialXingYao"),panelName="GeneralPopup_TrialXingYao"}, --试练增益 - [12]={view=require("Modules/Popup/View/GeneralPopup_TrialGain"),panelName="GeneralPopup_TrialGain",type=GENERAL_POPUP_TYPE.TrialGain}, + [GENERAL_POPUP_TYPE.TrialGain]={view=require("Modules/Popup/View/GeneralPopup_TrialGain"),panelName="GeneralPopup_TrialGain"}, --大闹天宫 回复 和 复活节点 - [13]={view=require("Modules/Popup/View/GeneralPopup_ExpeditionReply"),panelName="GeneralPopup_ExpeditionReply",type=GENERAL_POPUP_TYPE.ExpeditionReply}, + [GENERAL_POPUP_TYPE.ExpeditionReply]={view=require("Modules/Popup/View/GeneralPopup_ExpeditionReply"),panelName="GeneralPopup_ExpeditionReply"}, --试炼副本进入下一层 - [14]={view=require("Modules/Popup/View/GeneralPopup_TrialToNextFloor"),panelName="GeneralPopup_TrialToNextFloor",type=GENERAL_POPUP_TYPE.TrialToNextFloor}, + [GENERAL_POPUP_TYPE.TrialToNextFloor]={view=require("Modules/Popup/View/GeneralPopup_TrialToNextFloor"),panelName="GeneralPopup_TrialToNextFloor"}, --宝物分解 - [15] = {view = require("Modules/Popup/View/GeneralPopup_ResolveEquipTreasure"), panelName = "GeneralPopup_ResolveEquipTreasure",type=GENERAL_POPUP_TYPE.ResolveEquipTreasure}, + [GENERAL_POPUP_TYPE.ResolveEquipTreasure] = {view = require("Modules/Popup/View/GeneralPopup_ResolveEquipTreasure"), panelName = "GeneralPopup_ResolveEquipTreasure"}, --装备批量出售 - [16] = {view = require("Modules/Popup/View/GeneralPopup_EquipBatchSell"), panelName = "GeneralPopup_EquipBatchSell",type=GENERAL_POPUP_TYPE.EquipBatchSell}, + [GENERAL_POPUP_TYPE.EquipBatchSell] = {view = require("Modules/Popup/View/GeneralPopup_EquipBatchSell"), panelName = "GeneralPopup_EquipBatchSell"}, --装备单种出售 拉条 - [17] = {view = require("Modules/Popup/View/GeneralPopup_EquipSingleSell"), panelName = "GeneralPopup_EquipSingleSell",type=GENERAL_POPUP_TYPE.EquipSingleSell}, + [GENERAL_POPUP_TYPE.EquipSingleSell] = {view = require("Modules/Popup/View/GeneralPopup_EquipSingleSell"), panelName = "GeneralPopup_EquipSingleSell"}, --森罗次元炸弹 - [18] = {view = require("Modules/Popup/View/GeneralPopup_TrialBomb"), panelName = "GeneralPopup_TrialBomb",type=GENERAL_POPUP_TYPE.TrialBomb}, + [GENERAL_POPUP_TYPE.TrialBomb] = {view = require("Modules/Popup/View/GeneralPopup_TrialBomb"), panelName = "GeneralPopup_TrialBomb"}, --神将召唤、限时召唤、乾坤宝盒 二次确认界面 - [19] = {view = require("Modules/Popup/View/GeneralPopup_RecruitConfirm"), panelName = "GeneralPopup_RecruitConfirm",type=GENERAL_POPUP_TYPE.RecruitConfirm}, + [GENERAL_POPUP_TYPE.RecruitConfirm] = {view = require("Modules/Popup/View/GeneralPopup_RecruitConfirm"), panelName = "GeneralPopup_RecruitConfirm"}, --法宝回归 - [20] = {view = require("Modules/Popup/View/GeneralPopup_TalismanResolve"), panelName = "GeneralPopup_TalismanResolve",type=GENERAL_POPUP_TYPE.TalismanResolve}, - [21] = {view = require("Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims"), panelName = "GeneralPopup_BuyXuanYuanMirrorTims",type=GENERAL_POPUP_TYPE.XuanYuanBuyTimes}, - [22] = {view = require("Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel"), panelName = "GeneralPopup_QinglongSerectTreasureBuyLevel",type=GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel}, - [23] = {view = require("Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel"), panelName = "GeneralPopup_HeavenUnlockExtraRewardPanel",type=GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel}, + [GENERAL_POPUP_TYPE.TalismanResolve] = {view = require("Modules/Popup/View/GeneralPopup_TalismanResolve"), panelName = "GeneralPopup_TalismanResolve"}, + [GENERAL_POPUP_TYPE.XuanYuanBuyTimes] = {view = require("Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims"), panelName = "GeneralPopup_BuyXuanYuanMirrorTims"}, + [GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel] = {view = require("Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel"), panelName = "GeneralPopup_QinglongSerectTreasureBuyLevel"}, + [GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel] = {view = require("Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel"), panelName = "GeneralPopup_HeavenUnlockExtraRewardPanel"}, --灵兽战力加成 - [25] = {view = require("Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro"), panelName = "GeneralPopup_PokemonUpZhenAddPro",type=GENERAL_POPUP_TYPE.PokemonUpZhenAddPro}, + [GENERAL_POPUP_TYPE.PokemonUpZhenAddPro] = {view = require("Modules/Popup/View/GeneralPopup_PokemonUpZhenAddPro"), panelName = "GeneralPopup_PokemonUpZhenAddPro"}, --灵兽涅槃 - [26] = {view = require("Modules/Popup/View/GeneralPopup_PokemonResolve"), panelName = "GeneralPopup_PokemonResolve",type=GENERAL_POPUP_TYPE.PokemonResolve}, + [GENERAL_POPUP_TYPE.PokemonResolve] = {view = require("Modules/Popup/View/GeneralPopup_PokemonResolve"), panelName = "GeneralPopup_PokemonResolve"}, --灵兽还原 - [27] = {view = require("Modules/Popup/View/GeneralPopup_PokemonRestore"), panelName = "GeneralPopup_PokemonRestore",type=GENERAL_POPUP_TYPE.PokemonRestore}, + [GENERAL_POPUP_TYPE.PokemonRestore] = {view = require("Modules/Popup/View/GeneralPopup_PokemonRestore"), panelName = "GeneralPopup_PokemonRestore"}, --灵兽碎片合成 - [28]={view = require("Modules/Popup/View/GeneralPopup_PokemonChipCompound"), panelName = "GeneralPopup_PokemonChipCompound",type=GENERAL_POPUP_TYPE.PokemonCompound}, - [24] = {view = require("Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange"), panelName = "GeneralPopup_XiaoYaoYouItemExchange",type=GENERAL_POPUP_TYPE.XiaoYaoYouItemExchange}, + [GENERAL_POPUP_TYPE.PokemonCompound]={view = require("Modules/Popup/View/GeneralPopup_PokemonChipCompound"), panelName = "GeneralPopup_PokemonChipCompound"}, + [GENERAL_POPUP_TYPE.XiaoYaoYouItemExchange] = {view = require("Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange"), panelName = "GeneralPopup_XiaoYaoYouItemExchange"}, --社稷大典检查是否加入工会 - [29] = {view = require("Modules/Popup/View/GeneralPopup_SheJiCheckGuild"), panelName = "GeneralPopup_SheJiCheckGuild",type=GENERAL_POPUP_TYPE.SheJiCheckGuild}, + [GENERAL_POPUP_TYPE.SheJiCheckGuild] = {view = require("Modules/Popup/View/GeneralPopup_SheJiCheckGuild"), panelName = "GeneralPopup_SheJiCheckGuild"}, --YiJingBaoKuConfirm - [30] = {view = require("Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm"), panelName = "GeneralPopup_YiJingBaoKuConfirm",type=GENERAL_POPUP_TYPE.YiJingBaoKuConfirm}, + [GENERAL_POPUP_TYPE.YiJingBaoKuConfirm] = {view = require("Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm"), panelName = "GeneralPopup_YiJingBaoKuConfirm"}, --灵兽宝阁选择神兽 - [31] = {view = require("Modules/Popup/View/GeneralPopup_LingShouBaoGe"), panelName = "GeneralPopup_LingShouBaoGe",type=GENERAL_POPUP_TYPE.LingShouBaoGe}, + [GENERAL_POPUP_TYPE.LingShouBaoGe] = {view = require("Modules/Popup/View/GeneralPopup_LingShouBaoGe"), panelName = "GeneralPopup_LingShouBaoGe"}, --云游商人选择装备 - [32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan}, + [GENERAL_POPUP_TYPE.YunYouMan] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan"}, --招募奖励详情 - [33] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward",type=GENERAL_POPUP_TYPE.RecrutReward}, + [GENERAL_POPUP_TYPE.RecrutReward] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward"}, --限时抽卡选择up英雄 - [34] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralPopup_ChooseUpHero",type=GENERAL_POPUP_TYPE.ChooseUpHero}, - [35] = {view = require("Modules/Popup/View/GeneralPopup_EndlessPanel"), panelName = "GeneralPopup_EndlessPanel",type=GENERAL_POPUP_TYPE.WuJinSetting}, + [GENERAL_POPUP_TYPE.ChooseUpHero] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralPopup_ChooseUpHero"}, + [GENERAL_POPUP_TYPE.WuJinSetting] = {view = require("Modules/Popup/View/GeneralPopup_EndlessPanel"), panelName = "GeneralPopup_EndlessPanel"}, --up魂印 - [36] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpSoul"), panelName = "GeneralPopup_ChooseUpSoul",type=GENERAL_POPUP_TYPE.ChooseUpSoul}, + [GENERAL_POPUP_TYPE.ChooseUpSoul] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpSoul"), panelName = "GeneralPopup_ChooseUpSoul"}, --新增的心愿神将提示框 - [37] = {view = require("Modules/Popup/View/GeneralPopup_NewAddWishHero"), panelName = "GeneralPopup_NewAddWishHero",type=GENERAL_POPUP_TYPE.NewAddWishHero}, - + [GENERAL_POPUP_TYPE.NewAddWishHero] = {view = require("Modules/Popup/View/GeneralPopup_NewAddWishHero"), panelName = "GeneralPopup_NewAddWishHero"}, } --子模块预设 local contentPrefabs={} @@ -93,18 +92,18 @@ function GeneralPopup:InitComponent() this.Mask=Util.GetGameObject(this.gameObject,"Mask") --子模块脚本初始化 - for i = 1, #contentScripts do - contentScripts[i].view:InitComponent(Util.GetGameObject(this.contents, contentScripts[i].panelName)) + for key, value in pairs(contentScripts) do + value.view:InitComponent(Util.GetGameObject(this.contents, value.panelName)) end --预设赋值 - for i=1,#contentScripts do - contentPrefabs[i]=Util.GetGameObject(this.contents,contentScripts[i].panelName) + for key, value in pairs(contentScripts) do + contentPrefabs[key]=Util.GetGameObject(this.contents,value.panelName) end end function GeneralPopup:BindEvent() - for i = 1, #contentScripts do - contentScripts[i].view:BindEvent() + for key, value in pairs(contentScripts) do + value.view:BindEvent() end --返回按钮 Util.AddClick(this.backBtn,function() @@ -114,14 +113,14 @@ function GeneralPopup:BindEvent() end function GeneralPopup:AddListener() - for i = 1, #contentScripts do - contentScripts[i].view:AddListener() + for key, value in pairs(contentScripts) do + value.view:AddListener() end end function GeneralPopup:RemoveListener() - for i = 1, #contentScripts do - contentScripts[i].view:RemoveListener() + for key, value in pairs(contentScripts) do + value.view:RemoveListener() end end @@ -130,32 +129,30 @@ function GeneralPopup:OnSortingOrderChange() end local onOpenArgs--临时接的参数 需要onshow刷新的调用 function GeneralPopup:OnOpen(popupType,...) - -- local args={...} - -- popupType=args[1] onOpenArgs = ... --根据传入类型打开对应面板 --LogGreen("显示的类型 = "..popupType) - for i,v in pairs(contentScripts) do - if popupType==v.type then - index=i + for key, value in pairs(contentScripts) do + if popupType == key then + index = key break end end - for i=1,#contentPrefabs do - contentPrefabs[i].gameObject:SetActive(false) + for key, value in pairs(contentPrefabs) do + value.gameObject:SetActive(false) end - this.Mask:SetActive(index ~= GENERAL_POPUP_TYPE.Onhook) - this.BG:SetActive(index ~= GENERAL_POPUP_TYPE.Onhook and popupType ~= GENERAL_POPUP_TYPE.ChooseUpSoul) + this.Mask:SetActive(popupType ~= GENERAL_POPUP_TYPE.Onhook) + this.BG:SetActive(popupType ~= GENERAL_POPUP_TYPE.Onhook and popupType ~= GENERAL_POPUP_TYPE.ChooseUpSoul) - contentPrefabs[index].gameObject:SetActive(true) - contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参 + contentPrefabs[popupType].gameObject:SetActive(true) + contentScripts[popupType].view:OnShow(this,...)--1、传入自己 2、传入不定参 end function GeneralPopup:OnShow() - if index == 8 then--临时接的参数 需要onshow刷新的调用 + if index == GENERAL_POPUP_TYPE.RecruitBox then--临时接的参数 需要onshow刷新的调用 contentScripts[index].view:OnShow(this,onOpenArgs) end - this.backBtn:SetActive(index ~= 29) + this.backBtn:SetActive(index ~= GENERAL_POPUP_TYPE.SheJiCheckGuild) end function GeneralPopup:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index ed6852ad5d..ccabce2312 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -83,7 +83,7 @@ function QiJieShiLianPanel:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XiangYaoDuoBao,self.helpPosition.x,self.helpPosition.y) end) Util.AddClick(self.goalBtn,function() - PopupTipPanel.ShowTip("目标特性!") + UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.QiJieGoalAttri,self.configData) end) Util.AddClick(self.giftBtn,function() PopupTipPanel.ShowTip("遗物!") @@ -166,8 +166,13 @@ function QiJieShiLianPanel:SetTabBox() local name = state and "r_hero_xuanze_001" or "r_hero_xuanze_002" Util.GetGameObject(go,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(name) Util.GetGameObject(go,"LockImage"):SetActive(not state) + Util.AddOnceClick(go,function () + if not state then + PopupTipPanel.ShowTip(string.format( "%s开启【%s】试炼!",NumToWeek[self.configData.QijieType],self.configData.Chapter)) + end + end) end,false,true) - local num = (self.configData.QijieType - 1) > 0 and (self.configData.QijieType - 1) or 1 + local num = (self.configData.QijieType - 2) > 0 and (self.configData.QijieType - 2) or 1 self.ScrollView:SetIndex(num) end