diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab index fbe751b552..58333f5620 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationForcePanel.prefab @@ -1,79 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &229555310056175640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 969960706539681159} - - component: {fileID: 6337562984168621595} - - component: {fileID: 6392084866635787196} - m_Layer: 0 - m_Name: Property - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &969960706539681159 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229555310056175640} - 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: 5634055806577482042} - 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: 26.5, y: -35} - m_SizeDelta: {x: 53, y: 52} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6337562984168621595 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229555310056175640} - m_CullTransparentMesh: 0 ---- !u!114 &6392084866635787196 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229555310056175640} - 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: 8dc56930a36d721459859b17d252448a, 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 &723673846611239609 GameObject: m_ObjectHideFlags: 0 @@ -529,14 +455,13 @@ GameObject: - component: {fileID: 1674030298761666934} - component: {fileID: 1892599660485880997} - component: {fileID: 6622926914019880795} - - component: {fileID: 8084340325578650151} m_Layer: 0 m_Name: Calculate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1674030298761666934 RectTransform: m_ObjectHideFlags: 0 @@ -549,12 +474,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5634055806577482042} - m_RootOrder: 3 + 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: 461.6, y: -35} - m_SizeDelta: {x: 321, y: 53} + m_AnchoredPosition: {x: 512, y: -35} + m_SizeDelta: {x: 270, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1892599660485880997 CanvasRenderer: @@ -591,28 +516,14 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\uFF08256000+160\xD720000\uFF09" + m_Text: "\uFF08+%10\uFF09" LanguageIndex: 0 ---- !u!114 &8084340325578650151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2168763502376969229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &2347721207665065252 GameObject: m_ObjectHideFlags: 0 @@ -995,7 +906,7 @@ RectTransform: 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: 62, y: 46} + m_AnchoredPosition: {x: -2, y: 46} m_SizeDelta: {x: 700, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2698747357610184550 @@ -1018,7 +929,7 @@ MonoBehaviour: m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 670, y: 70} + m_CellSize: {x: 700, y: 70} m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -1310,12 +1221,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5634055806577482042} - m_RootOrder: 1 + 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: 71.635, y: -35} - m_SizeDelta: {x: 143.27, y: 53} + m_AnchoredPosition: {x: 242, y: -35} + m_SizeDelta: {x: 270, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4642471569344735161 CanvasRenderer: @@ -1358,7 +1269,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u653B\u51FB\u52A0\u6210\uFF1A" + m_Text: "\u653B\u51FB\u52A0\u6210\uFF1A111" LanguageIndex: 0 --- !u!1 &5197570058314910618 GameObject: @@ -1713,13 +1624,14 @@ GameObject: m_Component: - component: {fileID: 5634055806577482042} - component: {fileID: 926243744424916945} + - component: {fileID: 4427129518685913397} m_Layer: 0 m_Name: TextPre m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5634055806577482042 RectTransform: m_ObjectHideFlags: 0 @@ -1731,18 +1643,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 969960706539681159} - {fileID: 2558415634720257648} - - {fileID: 6108430004813521372} - {fileID: 1674030298761666934} - - {fileID: 1932179765818908660} m_Father: {fileID: 2635857727710591680} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -35} + m_SizeDelta: {x: 700, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &926243744424916945 CanvasRenderer: @@ -1752,6 +1661,30 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6806842379049348240} m_CullTransparentMesh: 0 +--- !u!114 &4427129518685913397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6806842379049348240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 50} + m_Spacing: {x: 50, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &6901561976102836439 GameObject: m_ObjectHideFlags: 0 @@ -2294,224 +2227,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &8184470262453861477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1932179765818908660} - - component: {fileID: 7575185447934348835} - - component: {fileID: 962952845128400915} - - component: {fileID: 6934948607281516992} - - component: {fileID: 1059417850080665518} - m_Layer: 0 - m_Name: change - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1932179765818908660 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8184470262453861477} - 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: 5634055806577482042} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 669.1, y: -35} - m_SizeDelta: {x: 94, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7575185447934348835 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8184470262453861477} - m_CullTransparentMesh: 0 ---- !u!114 &962952845128400915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8184470262453861477} - 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, g: 1, b: 0, a: 0} - 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: +90000 - LanguageIndex: 0 ---- !u!114 &6934948607281516992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8184470262453861477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &1059417850080665518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8184470262453861477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenSequeue: - - initV3: {x: 0, y: 0, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 1 - duration: 0.1 - delay: 0 - curveType: 1 - changeType: 6 - sequeueType: 0 - loop: 0 - loopType: 0 - targetObj: {fileID: 1932179765818908660} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 1 - isInit: 1 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 0 - duration: 1 - delay: 1 - curveType: 1 - changeType: 6 - sequeueType: 0 - loop: 0 - loopType: 0 - targetObj: {fileID: 1932179765818908660} - isPlayAudio: 1 - isHaveCloseBtn: 0 - isPlayOnOpen: 0 ---- !u!1 &8231516421912048291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6108430004813521372} - - component: {fileID: 1787794444077971890} - - component: {fileID: 7893709416320792377} - m_Layer: 0 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6108430004813521372 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8231516421912048291} - 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: 5634055806577482042} - 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: 206.27, y: -35} - m_SizeDelta: {x: 126, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1787794444077971890 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8231516421912048291} - m_CullTransparentMesh: 0 ---- !u!114 &7893709416320792377 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8231516421912048291} - 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, g: 0, b: 0, 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: +9999999 - LanguageIndex: 0 --- !u!1 &8635305199969690773 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua index 28619ebe63..fe6b006f0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua @@ -103,6 +103,7 @@ function IncarnationForcePanel:OnShow() self.value.text = string.format("") self.fill:GetComponent("RectTransform").sizeDelta = Vector3.New(445,26,0) self.btnText.text = "已达上限" + self.btnText.fontSize=35 end end @@ -110,15 +111,12 @@ end --设置单个数据 function IncarnationForcePanel:SetSingleData(_go,data,_index) local proName = Util.GetGameObject(_go,"PropertyName"):GetComponent("Text") - local Value = Util.GetGameObject(_go,"Value"):GetComponent("Text") local Calculate = Util.GetGameObject(_go,"Calculate"):GetComponent("Text") if IncarnationManager.incarnationForceLv == 0 then - proName.text = string.format("%s:",propertyConfig[data[1]].Info) - Value.text = string.format("+0%%") + proName.text = string.format("%s:+0%%",propertyConfig[data[1]].Info) else - proName.text = string.format("%s:",propertyConfig[data[1]].Info) - Value.text = string.format("+%s%%",data[2]/100) + proName.text = string.format("%s:+%s%%",propertyConfig[data[1]].Info,data[2]/100) end if this.nextConfigData then local addProp=this.nextConfigData.PropList[_index][2]-data[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index 59fed040bd..fb4a482477 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -112,8 +112,8 @@ function this.SetItemDataList(dataList,_incarnationForceLv) this.SetStar(dataList[i].id,dataList[i].star) this.SetSkillData(dataList[i].id) this.SetPropDatas(dataList[i].id) - this.incarnationForceLv=_incarnationForceLv end + this.incarnationForceLv=_incarnationForceLv HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Incarnation) end @@ -326,6 +326,9 @@ end ---检测化身之力红点 function this.CheckPowerBtnRedData(red) this.configData = ConfigManager.GetConfigData(ConfigName.ChangingForce,this.incarnationForceLv) + if not this.configData.ExpCost then + return false + end local curHaveItemNum=BagManager.GetItemCountById(this.configData.ExpCost[1]) local curCostItemNum=this.configData.ExpCost[2] if curHaveItemNum >=curCostItemNum then diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua index 79c3a94667..edd55050de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua @@ -46,7 +46,9 @@ function this:InitComponent() this.bianImg=Util.GetGameObject(this.costItem, "bianImg") this.upLvBtn = Util.GetGameObject(this.costLayout, "upLvBtn") + this.upLvText=Util.GetGameObject(this.costLayout, "upLvBtn/Text"):GetComponent("Text") this.upStarBtn = Util.GetGameObject(this.costLayout, "upStarBtn") + this.upStarText=Util.GetGameObject(this.costLayout, "upStarBtn/Text"):GetComponent("Text") this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform) end @@ -137,15 +139,19 @@ function this.UpdateWin() this.nextProp.gameObject:SetActive(false) this.costGrid.gameObject:SetActive(false) this.nextDrop.gameObject:SetActive(false) + this.forceLayout.gameObject:SetActive(false) + this.upLvText.text="已达上限" else this.nextProp.gameObject:SetActive(true) this.costGrid.gameObject:SetActive(true) this.nextDrop.gameObject:SetActive(true) + this.forceLayout.gameObject:SetActive(true) local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,true,false) this.SetPropInfo(this.nextProp,nextPropData) this.SetCostItem(cardLvConfig.Exp) local nextCardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel+1,"PoolId",this.cardConfig.LevelUpPool) this.nextDrop.text="+"..nextCardLvConfig.ChangingForceExp[2] + this.upLvText.text="升 级" end else @@ -166,17 +172,21 @@ function this.UpdateWin() this.costGrid.gameObject:SetActive(false) this.nextSkillDes.transform.parent.gameObject:SetActive(false) this.nextDrop.gameObject:SetActive(false) + this.forceLayout.gameObject:SetActive(false) + this.upStarText.text="已达上限" else this.nextSkillDes.gameObject:SetActive(true) this.nextSkillDes.text=IncarnationManager.GetSkillDesStr(curCardId,curStar+1) this.nextProp.gameObject:SetActive(true) this.costGrid.gameObject:SetActive(true) this.nextDrop.gameObject:SetActive(true) + this.forceLayout.gameObject:SetActive(true) local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,false,true) this.nextLvText.text=curStar+1 this.SetPropInfo(this.nextProp,nextPropData) this.SetCostItem(this.cardConfig.StarUpCost[curStar+1]) this.nextDrop.text="+"..this.cardConfig.StarUpExp[curStar+1][2] + this.upStarText.text="升 星" end end