diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab index 4379f1194e..f45d08e160 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3941559009706528494 CanvasRenderer: @@ -166,6 +166,7 @@ GameObject: - component: {fileID: 7274797596699487935} - component: {fileID: 2978873796253663799} - component: {fileID: 6627844666565400459} + - component: {fileID: 4109646213380972614} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -190,7 +191,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2978873796253663799 CanvasRenderer: @@ -235,6 +236,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5145\u503C" LanguageIndex: 0 +--- !u!114 &4109646213380972614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967231457933728231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &1298752840175255388 GameObject: m_ObjectHideFlags: 0 @@ -420,10 +435,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 118, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4755428599246343356 CanvasRenderer: @@ -500,10 +515,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6275955706316199721 CanvasRenderer: @@ -1133,10 +1148,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5818617628848707151 CanvasRenderer: @@ -1515,10 +1530,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 181, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6372460139430684745 CanvasRenderer: @@ -1580,7 +1595,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3426774782456427134 RectTransform: m_ObjectHideFlags: 0 @@ -1605,10 +1620,10 @@ RectTransform: m_Father: {fileID: 3129617478986272255} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 140, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -23} + m_SizeDelta: {x: 215, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4351184615061623245 MonoBehaviour: @@ -1789,7 +1804,7 @@ MonoBehaviour: m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!114 &748923441709940500 MonoBehaviour: @@ -1949,10 +1964,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 34, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6326068208291493611 CanvasRenderer: @@ -2029,10 +2044,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 139, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6782556990393610046 CanvasRenderer: @@ -2110,10 +2125,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 13, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 13, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1815451018577670510 CanvasRenderer: @@ -2264,7 +2279,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2703654448420865930 RectTransform: m_ObjectHideFlags: 0 @@ -2279,10 +2294,10 @@ RectTransform: m_Father: {fileID: 3129617478986272255} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 355, y: 0} - m_SizeDelta: {x: 0, y: 46} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -23} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1556712413964630940 CanvasRenderer: @@ -2367,10 +2382,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 202, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6134787424522773605 CanvasRenderer: @@ -2426,6 +2441,7 @@ GameObject: - component: {fileID: 3642677507929918682} - component: {fileID: 6775805915567472362} - component: {fileID: 4118452696578278927} + - component: {fileID: 7499745113206552175} m_Layer: 5 m_Name: progress m_TagString: Untagged @@ -2449,8 +2465,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38} + m_AnchoredPosition: {x: 140, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6775805915567472362 CanvasRenderer: @@ -2495,6 +2511,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53EF\u9886\u53D6(1920/2000)" LanguageIndex: 0 +--- !u!114 &7499745113206552175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8631154221814438210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &8649703854654293368 GameObject: m_ObjectHideFlags: 0 @@ -2527,10 +2557,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2726567246643373228 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 42c33e7540..3c632c2d8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -1,6 +1,7 @@ local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") local allData={} local itemsGrid = {}--item重复利用 +local moneyGrid = {}--moneyview重复利用 local this=LeiJiChongZhiPage local parent local endtime = 0 @@ -135,12 +136,22 @@ function this.SingleDataShow(pre,value) local activityRewardGo = pre activityRewardGo:SetActive(true) local sConFigData = value - local numTextPre = Util.GetGameObject(pre, "context/NumTextPre") - local numList = {} - for i = 1, numTextPre.transform.childCount do - table.insert(numList,numTextPre.transform:GetChild(i-1):GetComponent("Text")) - end - CreatNumberPrefab(tostring(sConFigData.value),numList) + Util.GetGameObject(pre, "context/NumTextPre").gameObject:SetActive(false) + Util.GetGameObject(pre, "context/price").gameObject:SetActive(false) + -- local numTextPre = Util.GetGameObject(pre, "context/NumTextPre") + -- local numList = {} + -- for i = 1, numTextPre.transform.childCount do + -- table.insert(numList,numTextPre.transform:GetChild(i-1):GetComponent("Text")) + -- end + -- CreatNumberPrefab(tostring(sConFigData.value),numList) + pre.gameObject:SetActive(true) + if not moneyGrid[pre] then + moneyGrid[pre] = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(pre, "context").transform, + sConFigData.value, MoneyNumViewType.Image_Horizontal, "ArtFont_1_cfont", 42, 1, Vector2.New(46, 46), Vector2.New(0, -25), MoneyNumViewImageType.Small_1) + end + moneyGrid[pre]:SetNum(sConFigData.value) + moneyGrid[pre]:SetOffsetPosition(Vector2.New(0, 0)) + moneyGrid[pre].transform:SetSiblingIndex(2) -- num.text = sConFigData.value -- this:NumToNum(num, sConFigData.value) -- num.text = sConFigData.value @@ -232,6 +243,14 @@ function LeiJiChongZhiPage:OnDestroy() sortingOrder = 0 allData={} itemsGrid = {} + if moneyGrid and LengthOfTable(moneyGrid) > 0 then + for key, value in pairs(moneyGrid) do + if value then + SubUIManager.Close(value) + value = nil + end + end + end end function LeiJiChongZhiPage:OnHide()