diff --git a/Assets/ManagedResources/EffectResUI/Practice/Prefab/fx_ui_xiuxingshengxin.prefab b/Assets/ManagedResources/EffectResUI/Practice/Prefab/fx_ui_xiuxingshengxin.prefab index 8e5b88524d..14d3aa31f9 100644 --- a/Assets/ManagedResources/EffectResUI/Practice/Prefab/fx_ui_xiuxingshengxin.prefab +++ b/Assets/ManagedResources/EffectResUI/Practice/Prefab/fx_ui_xiuxingshengxin.prefab @@ -14311,7 +14311,7 @@ Transform: - {fileID: 5182032395483848592} - {fileID: 5182032395835277393} - {fileID: 5182032395490922875} - m_Father: {fileID: 5182032396987144477} + m_Father: {fileID: 4383056797866256410} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &5182032395519504644 @@ -28509,7 +28509,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5182032396987144477} + - component: {fileID: 4383056797866256410} - component: {fileID: 5182032396987144475} - component: {fileID: 5182032396987144474} m_Layer: 0 @@ -28519,8 +28519,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5182032396987144477 -Transform: +--- !u!224 &4383056797866256410 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -28534,6 +28534,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!198 &5182032396987144475 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index bcba57e8e5..056d8d3cb3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -841,7 +841,9 @@ RectTransform: 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_Children: + - {fileID: 4667987387665709971} + - {fileID: 9052929449090847892} m_Father: {fileID: 9073860018243356351} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1778,7 +1780,8 @@ RectTransform: 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_Children: + - {fileID: 3024282534026072499} m_Father: {fileID: 8126515032001170632} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2762,3 +2765,343 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &1525548329946528169 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7854169752660611288} + m_Modifications: + - target: {fileID: 5182032396987144476, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_Name + value: fx_ui_xiuxingshengxin + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144476, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5182032396987144477, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, type: 3} +--- !u!224 &3024282534026072499 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4383056797866256410, guid: 72db041fb03b7eb4eb3b2035e3ef9cd8, + type: 3} + m_PrefabInstance: {fileID: 1525548329946528169} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2568039972064448765 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5169296584388764232} + m_Modifications: + - target: {fileID: 6773965661432202346, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_Name + value: looping + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202346, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfcc3fd87863dfd4994fcd909693cbfd, type: 3} +--- !u!224 &9052929449090847892 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6773965661432202345, guid: cfcc3fd87863dfd4994fcd909693cbfd, + type: 3} + m_PrefabInstance: {fileID: 2568039972064448765} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4637224940983744743 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5169296584388764232} + m_Modifications: + - target: {fileID: 41304596588233589, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_Name + value: Fx_xiuxing_qiu_brust + objectReference: {fileID: 0} + - target: {fileID: 41304596588233589, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0f7e8d92b2231e4499a64895df53da82, type: 3} +--- !u!224 &4667987387665709971 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 41304596588233588, guid: 0f7e8d92b2231e4499a64895df53da82, + type: 3} + m_PrefabInstance: {fileID: 4637224940983744743} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 56c79ef0d4..f30a090fcc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -41,9 +41,12 @@ function Practice:InitComponent() self.content = Util.GetGameObject(self.bottom, "Content") self.textBtn = Util.GetGameObject(self.content, "Text") self.needStar = Util.GetGameObject(self.content, "num"):GetComponent("Text") + self.effect = Util.GetGameObject(self.mid, "Man/fx_ui_xiuxingshengxin") + self.effect:SetActive(false) self.itemList = {} self.pointList = {} self.lineList = {} + self.effectUpgradeList = {} end function Practice:BindEvent() @@ -83,13 +86,28 @@ function Practice:BindEvent() oldPower = newPower --名字颜色 Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnChangeName) + local curNum = XinXianConfig[PracticeManager.PracticeLevel].RealmLevel + if curNum ~= 0 then + for i = 1, #self.effectUpgradeList do + self.effectUpgradeList[i]:SetActive(false) + end + self.effectUpgradeList[curNum]:SetActive(true) + else + for i = 1, #self.effectUpgradeList do + self.effectUpgradeList[i]:SetActive(false) + end + end --战力更改请求 NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) if PracticeManager.PracticeBigLevel - oldBigLevel == 1 then - UIManager.OpenPanel(UIName.CongratulationPopup,CONGRATULATION_TYPE.Practice,XinXianConfig[PracticeManager.PracticeLevel]) - if PracticeManager.PracticeBigLevel == 2 then - Game.GlobalEvent:DispatchEvent(GameEvent.Practice.PracticeGuide) - end + self.effect:SetActive(true) + Timer.New(function () + UIManager.OpenPanel(UIName.CongratulationPopup,CONGRATULATION_TYPE.Practice,XinXianConfig[PracticeManager.PracticeLevel]) + if PracticeManager.PracticeBigLevel == 2 then + Game.GlobalEvent:DispatchEvent(GameEvent.Practice.PracticeGuide) + end + self.effect:SetActive(false) + end,1):Start() end self:OnShow() end) @@ -181,6 +199,9 @@ function Practice:RefreshPoints() self.pointList[i]:SetActive(true) self.pointList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(data.Img) self.pointList[i]:GetComponent("RectTransform").localPosition = data.Pos + Util.GetGameObject(self.pointList[i],"looping"):SetActive(data.State == 1) + self.effectUpgradeList[i] = Util.GetGameObject(self.pointList[i],"Fx_xiuxing_qiu_brust") + -- self.effectUpgradeList[i]:SetActive(false) Util.AddOnceClick(self.pointList[i],function () UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.PracticeLevel,data) end) @@ -281,6 +302,7 @@ function Practice:OnDestroy() self.itemList = {} self.pointList = {} self.lineList = {} + self.effectUpgradeList = {} end return Practice \ No newline at end of file