diff --git a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab index 387874940d..bd779b522a 100644 --- a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab @@ -111,10 +111,10 @@ RectTransform: m_Father: {fileID: 2280241434527131215} 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: 45, y: -71.5} - m_SizeDelta: {x: 64.04, y: 57.1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29, y: 0} + m_SizeDelta: {x: 64.04001, y: 57.1} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1926325275717871179 CanvasRenderer: @@ -184,16 +184,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114551926285607871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 5.164566} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5391102142789844470} - m_RootOrder: 2 + m_Father: {fileID: 3409355027622770596} + 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: 0.000024319, y: -309.28} - m_SizeDelta: {x: 704.4, y: 62.7} + m_AnchoredPosition: {x: 257.2, y: 0.7199402} + m_SizeDelta: {x: 377.6, y: 139.3} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6869683397130100868 CanvasRenderer: @@ -224,20 +224,95 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 32 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 24 - m_MaxSize: 32 - m_Alignment: 4 + m_MinSize: 3 + m_MaxSize: 35 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 1.5 m_Text: LanguageIndex: 0 +--- !u!1 &1983824286226686034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3409355027622770596} + - component: {fileID: 2462079492557140839} + - component: {fileID: 6226878188108760390} + m_Layer: 0 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3409355027622770596 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983824286226686034} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.164566} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6618357217872503313} + m_Father: {fileID: 5391102142789844470} + m_RootOrder: 2 + 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: 2.9734, y: -379.3} + m_SizeDelta: {x: 726.05, y: 138.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2462079492557140839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983824286226686034} + m_CullTransparentMesh: 0 +--- !u!114 &6226878188108760390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983824286226686034} + 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: 040b2d02b8b551748b95d94345cbcfe6, 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 &2497443000525373662 GameObject: m_ObjectHideFlags: 0 @@ -272,7 +347,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: -8, y: -409} + m_AnchoredPosition: {x: 216, y: -349} m_SizeDelta: {x: 169, y: 91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &700845277403535816 @@ -487,7 +562,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: 277.8, y: -53.07} + m_AnchoredPosition: {x: 213, y: -420} m_SizeDelta: {x: 176.4, y: 57.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4712899983027829934 @@ -545,10 +620,10 @@ RectTransform: m_Father: {fileID: 2280241434527131215} 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: 22.4, y: -28.6} - m_SizeDelta: {x: 72.79, y: 57.1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -88, y: 0} + m_SizeDelta: {x: 72.79001, y: 57.1} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8005151546230895454 CanvasRenderer: @@ -624,9 +699,9 @@ RectTransform: m_Father: {fileID: 2280241434527131215} 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: 26.664978, y: -71.4999} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 55.53, y: 48.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5262296256222781431 @@ -694,7 +769,7 @@ RectTransform: m_GameObject: {fileID: 6516800800680033167} 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_LocalScale: {x: 0.8, y: 0.8, z: 0} m_Children: - {fileID: 7185264973662528582} - {fileID: 8498858578554701288} @@ -703,7 +778,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: -8, y: -409} + m_AnchoredPosition: {x: 216, y: -349} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2497980411967337749 @@ -1121,7 +1196,7 @@ RectTransform: m_Children: - {fileID: 8298748580827318525} - {fileID: 6657968512004497310} - - {fileID: 6618357217872503313} + - {fileID: 3409355027622770596} - {fileID: 4101560413708203383} - {fileID: 2280241434527131215} - {fileID: 6451597166764822586} diff --git a/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab index 6b826933ed..1882a4be0a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Likability/HeroLikeAbilityPanel.prefab @@ -333,12 +333,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2124249695} + - {fileID: 8162072501622411793} m_Father: {fileID: 6100468993864897443} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000017166, y: 202.3} + m_AnchoredPosition: {x: 0.000017166, y: 137.1} m_SizeDelta: {x: 350, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1033999046 @@ -1785,6 +1786,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3975161362909615941} m_CullTransparentMesh: 0 +--- !u!1 &3997734553138755186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8162072501622411793} + - component: {fileID: 8924162851585464251} + - component: {fileID: 1434493064559357729} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8162072501622411793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3997734553138755186} + 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: 8805694010566401245} + m_Father: {fileID: 1033999043} + m_RootOrder: 1 + 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: 125.06, y: 110.1} + m_SizeDelta: {x: 214.63, y: 88.62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8924162851585464251 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3997734553138755186} + m_CullTransparentMesh: 0 +--- !u!114 &1434493064559357729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3997734553138755186} + 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: cc769968502bdcc4abbc1a7f789bfb2e, 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 &4163896957229461381 GameObject: m_ObjectHideFlags: 0 @@ -2275,6 +2351,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5897648675948394955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8805694010566401245} + - component: {fileID: 6347168467800243327} + - component: {fileID: 7405469846444786983} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8805694010566401245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897648675948394955} + 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: 8162072501622411793} + 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, y: 4.31} + m_SizeDelta: {x: 155.47, y: 71.65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6347168467800243327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897648675948394955} + m_CullTransparentMesh: 0 +--- !u!114 &7405469846444786983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897648675948394955} + 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: 0.8238507, 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: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u597D\u611F\u5EA6+50" + LanguageIndex: 0 --- !u!1 &6867562663069819059 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua index bd56df24f4..c894e50d82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua @@ -64,6 +64,8 @@ function HeroLikeAbilityPanel:InitComponent() self.remainTimes.gameObject:SetActive(false) self.giveBtn = Util.GetGameObject(self.transform, "giveBtn") self.trigger = Util.GetEventTriggerListener(self.giveBtn) + self.popup = Util.GetGameObject(self.giveBtn, "Image") + self.popupText = Util.GetGameObject(self.popup, "Text"):GetComponent("Text") self.OnPointerDo = function(go, data) self:OnPointerDown1(go, data) @@ -261,6 +263,7 @@ end function HeroLikeAbilityPanel:SetSelectKuang(isMove) if curselectId < 1 then self.select.gameObject:SetActive(false) + self.popup:SetActive(false) else if isMove then self.grid:GetComponent("RectTransform").anchoredPosition = self.proGrid2Pos @@ -274,6 +277,8 @@ function HeroLikeAbilityPanel:SetSelectKuang(isMove) end end self.select.transform.localPosition = Vector3.New(-7.5,3.5) + self.popup:SetActive(true) + self.popupText.text = string.format( "好感度+%s",LikabilityManager.GetCurItemValue(curHeroData.Id,curselectId,1)) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua index dff14d51e3..62781305f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua @@ -148,6 +148,14 @@ function this.UpdatelSingleHeroData(heroId,itemId,itemNum) PopupTipPanel.ShowTip("好感度+"..value) end +--过去 +function this.GetCurItemValue(heroId,itemId,itemNum) + local value = 0 + local tempheroConfig = heroConfig[heroId] + value = this.ItemList[itemId][tempheroConfig.PropertyName]*itemNum + return value +end + -- -1 总好感度 其他是神将id function this.GetTotalHeroLikeLv(index) local totalCurNum,totalLv,totalNum = 0,0,0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 7b70b1af5b..7acfc65a78 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -54,7 +54,7 @@ function this:OnShow(_parent,...) _Con_Recharge = tonumber(con[1]) _Con_Star = tonumber(con[2]) this.titleText.text=Language[11587] - this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem) + this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem) this.text2.text=""--Language[11589] --后续改成读表 this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) --Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591] diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index 2ea77ffd3a..4c212546ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -44,11 +44,14 @@ function this.CreatSingleConfigData(configData) data.name = GetLanguageStrById(configData.Name) data.teamers = configData.Teamers data.activePara = configData.ActivePara - data.activeParaTip = Language[12277] + data.activeParaTip = ""--Language[12277] for i = 1, #data.activePara do local config = propertyConfig[data.activePara[i][1]] local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2]) data.activeParaTip = data.activeParaTip..GetLanguageStrById(config.Info).."+"..value .. " " + if i%2==0 then + data.activeParaTip = data.activeParaTip.."\n" + end end data.activeParaTip = rtrim(data.activeParaTip) data.activeForce = configData.ActiveForce diff --git a/Assets/ManagedResources/~Lua/View/FetterItem.lua b/Assets/ManagedResources/~Lua/View/FetterItem.lua index 3a370f9220..9d9106a67c 100644 --- a/Assets/ManagedResources/~Lua/View/FetterItem.lua +++ b/Assets/ManagedResources/~Lua/View/FetterItem.lua @@ -14,7 +14,7 @@ function FetterItem:InitComponent() self.name = Util.GetGameObject(self.gameObject,"bg/nameDi/nameText"):GetComponent("Text") self.mask = Util.GetGameObject(self.gameObject,"bg/mask") self.grid = Util.GetGameObject(self.gameObject,"scroll") - self.tipText = Util.GetGameObject(self.gameObject,"tipText"):GetComponent("Text") + self.tipText = Util.GetGameObject(self.gameObject,"tip/tipText"):GetComponent("Text") self.activeBtn = Util.GetGameObject(self.gameObject,"activeBtn") self.activeBtnRed = Util.GetGameObject(self.gameObject,"redpot") self.reward = Util.GetGameObject(self.gameObject,"reward") @@ -57,11 +57,11 @@ function FetterItem:SetData(data,_parent) self.itemData = data self.name.text = self.itemData.name if self.itemData.enabled < 1 then - self.tipText.text = string.format("%s",self.itemData.activeParaTip) + self.tipText.text = string.format("%s",self.itemData.activeParaTip) elseif self.itemData.enabled then - self.tipText.text = string.format("%s",self.itemData.activeParaTip) + self.tipText.text = string.format("%s",self.itemData.activeParaTip) end - self.tipText.text = self.itemData.activeParaTip + -- self.tipText.text = self.itemData.activeParaTip if self.itemData.reward and #self.itemData.reward > 0 then self.reward.gameObject:SetActive(true) self.rewardIcon = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemData.reward[1][1]].ResourceID))