From 40cafcca324e642e0c9feb3e79ddea76c5b4a2cd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 20 May 2021 11:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E7=A5=9E?= =?UTF-8?q?=E5=8D=B0=E7=95=8C=E9=9D=A2=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Practice/PracticeImprintPanel.prefab | 214 +++++++++++++++--- .../Modules/Practice/PracticeImprintPanel.lua | 40 +++- 2 files changed, 208 insertions(+), 46 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index e8907aee82..6069e7a442 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -260,7 +260,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3155037457294790606} - - {fileID: 2119154237191095777} + - {fileID: 2553759180244413173} - {fileID: 374481616577159392} - {fileID: 7150009681660735616} - {fileID: 6288891644257010922} @@ -2393,6 +2393,101 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7834\u800C\u540E\u7ACB" LanguageIndex: 0 +--- !u!1 &3628100453858938618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2851222674483561166} + - component: {fileID: 9103983125958741125} + - component: {fileID: 3192490633842889124} + - component: {fileID: 2118592718510322225} + m_Layer: 0 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2851222674483561166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628100453858938618} + 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: 2553759180244413173} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.45013428} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &9103983125958741125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628100453858938618} + 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: 100 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 80 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &3192490633842889124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628100453858938618} + 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!114 &2118592718510322225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628100453858938618} + 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: 1808 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3632051549540542228 GameObject: m_ObjectHideFlags: 0 @@ -2506,6 +2601,88 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3853548438243551823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2553759180244413173} + - component: {fileID: 5559974153339085360} + - component: {fileID: 8594897013185962644} + m_Layer: 0 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2553759180244413173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2851222674483561166} + m_Father: {fileID: 544039711229597497} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -56.4} + m_SizeDelta: {x: 0, y: -112.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5559974153339085360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8594897013185962644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 2851222674483561166} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &3886299620309998347 GameObject: m_ObjectHideFlags: 0 @@ -5355,38 +5532,3 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &9156193307918917723 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2119154237191095777} - m_Layer: 0 - m_Name: Scroll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2119154237191095777 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9156193307918917723} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 9.75} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 544039711229597497} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -86.7} - m_SizeDelta: {x: 0, y: -173.5} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 1581b14053..b743539681 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -6,7 +6,7 @@ function PracticeImprint:InitComponent() self.spLoader = SpriteLoader.New() self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform) self.backBtn = Util.GetGameObject(self.gameObject, "backBtn") - self.Scroll = Util.GetGameObject(self.gameObject, "Scroll") + self.Scroll = Util.GetGameObject(self.gameObject, "Scroll/grid") self.ImprintPre = Util.GetGameObject(self.gameObject, "ImprintPre") self.ImprintInfo = Util.GetGameObject(self.gameObject, "ImprintInfo") self.ImprintInfoBack = Util.GetGameObject(self.ImprintInfo, "close") @@ -25,12 +25,13 @@ function PracticeImprint:InitComponent() self.doBtn = Util.GetGameObject(self.ImprintInfo, "Content/Btn") self.doBtnText = Util.GetGameObject(self.doBtn, "Text"):GetComponent("Text") - local rootHight = self.Scroll.transform.rect.height - local width = self.Scroll.transform.rect.width - self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform, - self.ImprintPre, nil,Vector2.New(width, rootHight), 1, 1,Vector2.New(35, 0)) - self.ScrollView.moveTween.MomentumAmount = 1 - self.ScrollView.moveTween.Strength = 2 + -- local rootHight = self.Scroll.transform.rect.height + -- local width = self.Scroll.transform.rect.width + -- self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform, + -- self.ImprintPre, nil,Vector2.New(width, rootHight), 1, 1,Vector2.New(35, 0)) + -- self.ScrollView.moveTween.MomentumAmount = 1 + -- self.ScrollView.moveTween.Strength = 2 + self.ImprintList = {} end function PracticeImprint:BindEvent() @@ -63,9 +64,27 @@ end function PracticeImprint:Refresh(isTop,isAni,func) self.allImprintData = PracticeManager.GetAllImprintData() self.ImprintInfo:SetActive(false) - self.ScrollView:SetData(self.allImprintData, function(index, go) - self:SetPre(index,go,self.allImprintData[index]) - end,isTop,isAni) + -- self.ScrollView:SetData(self.allImprintData, function(index, go) + -- self:SetPre(index,go,self.allImprintData[index]) + -- end,isTop,isAni) + + if not self.ImprintList then + self.ImprintList = {} + end + for k,v in ipairs(self.ImprintList) do + v.gameObject:SetActive(false) + end + for i = 1, #self.allImprintData do + local data = self.allImprintData[i] + if not self.ImprintList[i] then + self.ImprintList[i] = newObject(self.ImprintPre) + self.ImprintList[i].transform:SetParent(self.Scroll.transform) + self.ImprintList[i].transform.localScale = Vector3.one + self.ImprintList[i].transform.localPosition = Vector3.zero + end + self.ImprintList[i]:SetActive(true) + self:SetPre(i,self.ImprintList[i],self.allImprintData[i]) + end if func then func() end @@ -225,6 +244,7 @@ function PracticeImprint:OnDestroy() self.spLoader:Destroy() SubUIManager.Close(self.UpView) self.UpView = nil + self.ImprintList = {} end return PracticeImprint \ No newline at end of file