diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
index 63f6accf46..eadd303f92 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/LikeabilityPopup.prefab
@@ -202,8 +202,6 @@ RectTransform:
m_Children:
- {fileID: 8843280134183422887}
- {fileID: 1148939108869446012}
- - {fileID: 3436260046852721227}
- - {fileID: 2834099657503461235}
m_Father: {fileID: 5601896589029272011}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -336,7 +334,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 361.65, y: -0.000063164814}
+ m_AnchoredPosition: {x: 361.65, y: -0.000012027347}
m_SizeDelta: {x: 723.3, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &7575507291051525301
@@ -405,12 +403,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 2641095517172412257}
- m_RootOrder: 3
+ m_Father: {fileID: 1148939108869446012}
+ 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: -3.4, y: -113}
+ m_AnchoredPosition: {x: 0.00005054474, y: -104.49993}
m_SizeDelta: {x: 256, y: 40.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2422773188584772773
@@ -540,16 +538,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3148512921626757698}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: 2641095517172412257}
- m_RootOrder: 2
+ m_Father: {fileID: 1148939108869446012}
+ 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: -3.4, y: -1.85}
+ m_AnchoredPosition: {x: 0.00005054474, y: 6.650066}
m_SizeDelta: {x: 256, y: 53.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6705008660338094179
@@ -709,6 +707,7 @@ GameObject:
- component: {fileID: 3317469863392146604}
- component: {fileID: 8649701734487364304}
- component: {fileID: 4570352802793397501}
+ - component: {fileID: 1745427587298886579}
m_Layer: 5
m_Name: title
m_TagString: Untagged
@@ -733,7 +732,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 631.1, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8649701734487364304
CanvasRenderer:
@@ -777,6 +776,20 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u603B\u597D\u611F\u5EA6\u5C5E\u6027"
+--- !u!114 &1745427587298886579
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5761760000363587408}
+ 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 &6182841616647960639
GameObject:
m_ObjectHideFlags: 0
@@ -1186,6 +1199,7 @@ RectTransform:
- {fileID: 5321483325535019191}
- {fileID: 3317469863392146604}
- {fileID: 8375993777823693432}
+ - {fileID: 422643730975794355}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1226,7 +1240,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 5.2
+ m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -1259,7 +1273,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: 3436260046852721227}
+ - {fileID: 2834099657503461235}
m_Father: {fileID: 2641095517172412257}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1305,6 +1321,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8604604425829763521
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 422643730975794355}
+ - component: {fileID: 5843951959549784315}
+ - component: {fileID: 5772624877925442353}
+ m_Layer: 5
+ m_Name: fenge
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &422643730975794355
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8604604425829763521}
+ 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: 9090717114976058863}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: 22.5}
+ m_SizeDelta: {x: 632.2, y: 2}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5843951959549784315
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8604604425829763521}
+ m_CullTransparentMesh: 0
+--- !u!114 &5772624877925442353
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8604604425829763521}
+ 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: 0
+ 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: 21e18b4111348a64684763f0a33d142c, 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 &8883238478301340286
GameObject:
m_ObjectHideFlags: 0
@@ -1316,6 +1406,7 @@ GameObject:
- component: {fileID: 8375993777823693432}
- component: {fileID: 5747301298875000768}
- component: {fileID: 2936331656785944192}
+ - component: {fileID: 1147414076817982144}
m_Layer: 5
m_Name: content
m_TagString: Untagged
@@ -1384,6 +1475,20 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5168\u4F53\u751F\u547D"
+--- !u!114 &1147414076817982144
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8883238478301340286}
+ 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 &9165522331602773854
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
index ff19fff9a7..8cc450bc3c 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleLikeabilityPopup.prefab
@@ -489,6 +489,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &2938583373442888621
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 280604021216301846}
+ - component: {fileID: 5252460583724702840}
+ - component: {fileID: 6726159602810735195}
+ m_Layer: 5
+ m_Name: fenge
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &280604021216301846
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2938583373442888621}
+ 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: 9090717114976058863}
+ 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: 0, y: -91.86}
+ m_SizeDelta: {x: 634.7, y: 2}
+ m_Pivot: {x: 0, y: 1}
+--- !u!222 &5252460583724702840
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2938583373442888621}
+ m_CullTransparentMesh: 0
+--- !u!114 &6726159602810735195
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2938583373442888621}
+ 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: 21e18b4111348a64684763f0a33d142c, 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 &4011359818800892791
GameObject:
m_ObjectHideFlags: 0
@@ -1130,6 +1204,7 @@ RectTransform:
m_Children:
- {fileID: 3317469863392146604}
- {fileID: 8375993777823693432}
+ - {fileID: 280604021216301846}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1170,7 +1245,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 6.93
+ m_Spacing: 11
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -1363,8 +1438,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: -48.35}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: -45.93}
+ m_SizeDelta: {x: 0, y: 39}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5747301298875000768
CanvasRenderer:
@@ -1407,7 +1482,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5168\u4F53\u751F\u547D"
+ m_Text:
--- !u!114 &8841633203694036813
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
index 7698a532d9..238f46da03 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua
@@ -316,12 +316,11 @@ function HeroLikeAbilityPanel:UpdateItemList()
Util.AddLongPressClick(self.itemList[i].pre, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,items[i].id)
end, 0.5)
-
end
end
if newid < 1 then
self.select.gameObject:SetActive(false)
- elseif curselectId ~= newid then
+ elseif curselectId ~= newid and (not self.itemListNum[curselectId] or self.itemListNum[curselectId] < 1) then
curselectId = newid
self:SetSelectKuang(par)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
index f01a9561fc..e92926fbaa 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua
@@ -431,7 +431,7 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color)
else
local config = ConfigManager.TryGetConfigDataByKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",k)
if config then
- str1 = string.format(config.Name,string.format("%s\n",_color,GetEquipPropertyFormatStr(config.IfFloat, v)))
+ str1 = string.format(config.Name,string.format("%s",_color,GetEquipPropertyFormatStr(config.IfFloat, v)))
end
end
table.insert(newProList,str1)
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua
index 23c74bf79c..ae29fdf772 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua
@@ -4,6 +4,11 @@ LikeabilityPopup = Inherit(BasePanel)
--特权--橙色
--总好感度属性: --黄色
--+500 --绿色
+local pos = {
+ ["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
+ ["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
+ ["h_haogandu_3"] = {mask = Vector3.New(-16.15,0,0),icon = Vector3.New(-18.84,0,0)} ,
+}
function LikeabilityPopup:InitComponent()
self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.transform, "BackMask")
@@ -13,8 +18,9 @@ function LikeabilityPopup:InitComponent()
--h_haogandu_1 h_haogandu_2 h_haogandu_3
self.likeabilitymask = Util.GetGameObject(self.likeabilityDi.transform, "mask"):GetComponent("Image")
--self.likeabilitymask.fillAmount
- self.lv = Util.GetGameObject(self.likeabilityBtn, "lv"):GetComponent("Text")
- self.progress = Util.GetGameObject(self.likeabilityBtn, "progress"):GetComponent("Text")
+ self.icon = Util.GetGameObject(self.likeabilityBtn, "icon")
+ self.lv = Util.GetGameObject(self.likeabilityBtn, "icon/lv"):GetComponent("Text")
+ self.progress = Util.GetGameObject(self.likeabilityBtn, "icon/progress"):GetComponent("Text")
self.pro = Util.GetGameObject(self.transform, "pro")
self.proContent = Util.GetGameObject(self.pro, "content")
self.proGrid1 = Util.GetGameObject(self.transform, "scroll/proScrollgrid1")
@@ -53,6 +59,8 @@ function LikeabilityPopup:UpdateTopLayoutPanel()
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1)
local config = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LikeAbility,"Type",1,"Level",lv)
self.likeabilityDi.sprite = self.spLoader:LoadSprite(config.Bg)
+ self.likeabilitymask.transform.localPosition = pos[config.Bg].mask
+ self.icon.transform.localPosition = pos[config.Bg].icon
self.lv.text = lv
if LikabilityManager.CheckIsMaxLv(-1) then
self.progress.text = "好感度最佳"
@@ -65,8 +73,8 @@ function LikeabilityPopup:UpdateTopLayoutPanel()
end
function LikeabilityPopup:UpDataProList(lv)
- local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"总好感度属性:",""," 全体%s\n 全体%s","",lv + 1)
- local pro2 = LikabilityManager.GetViewProData(1,lv,lv," 当前等级加成:","%s级","属性加成:%s %s","特权加成:%s",nil,true)
+ local pro1 = LikabilityManager.GetViewProData(1,-1,lv," 总好感度属性:",""," 全体%s\n 全体%s","",lv + 1)
+ local pro2 = LikabilityManager.GetViewProData(1,lv,lv," 当前等级加成:","%s级","属性加成:%s %s","特权加成:%s",nil,true)
for i = 1,#self.proList do
self.proList[i].go.gameObject:SetActive(false)
end
@@ -80,6 +88,7 @@ function LikeabilityPopup:UpDataProSingleList(data,index,parent)
self.proList[index].go = newObjToParent(self.pro,parent.transform)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
self.proList[index].fenge = Util.GetGameObject(self.proList[index].go, "Image")
+ self.proList[index].fengePre = Util.GetGameObject(self.proList[index].go, "fenge")
if index == 1 then
self.proList[index].fenge.gameObject:SetActive(false)
else
@@ -95,6 +104,7 @@ function LikeabilityPopup:UpDataProSingleList(data,index,parent)
if not self.proList[index][i] then
self.proList[index][i] = {}
self.proList[index][i].go = newObjToParent(self.proContent,self.proList[index].go)
+ self.proList[index][i].fenge = newObjToParent(self.proList[index].fengePre,self.proList[index].go)
self.proList[index][i].goText = self.proList[index][i].go:GetComponent("Text")
end
if data.prolist[i] == "" then
@@ -103,6 +113,12 @@ function LikeabilityPopup:UpDataProSingleList(data,index,parent)
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
end
+ LogGreen("i:"..i)
+ if i%3 == 0 then
+ self.proList[index][i].fenge.gameObject:SetActive(true)
+ else
+ self.proList[index][i].fenge.gameObject:SetActive(false)
+ end
end
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua
index d155951be5..d0f7367ff0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua
@@ -15,6 +15,7 @@ function RoleLikeabilityPopup:InitComponent()
self.pro = Util.GetGameObject(self.transform, "pro")
self.proContent = Util.GetGameObject(self.pro, "content")
+ self.fenge = Util.GetGameObject(self.pro, "fenge")
self.proGrid = Util.GetGameObject(self.transform, "scroll/proScroll/proScrollGrid")
self.pos = Util.GetGameObject(self.transform, "scroll/pos")
self.proList = {}
@@ -67,7 +68,7 @@ function RoleLikeabilityPopup:UpdateTopLayoutPanel()
end
function RoleLikeabilityPopup:UpDataProList(lv)
- local pro2 = LikabilityManager.GetViewProData(self.curheroData.Id,lv,lv,"","好感度%s级(%s/%s)",""..self.curheroData.ReadingName.." %s %s\n","特权加成:%s",nil,true)
+ local pro2 = LikabilityManager.GetViewProData(self.curheroData.Id,lv,lv,"","好感度%s级(%s/%s)",""..self.curheroData.ReadingName.." %s %s","",nil,true)
for i = 1,#self.proList do
self.proList[i].go.gameObject:SetActive(false)
end
@@ -95,13 +96,19 @@ function RoleLikeabilityPopup:UpDataProSingleList(data,index)
if not self.proList[index][i] then
self.proList[index][i] = {}
self.proList[index][i].go = newObjToParent(self.proContent,self.proList[index].go)
+ self.proList[index][i].fenge = newObjToParent(self.fenge,self.proList[index].go)
self.proList[index][i].goText = self.proList[index][i].go:GetComponent("Text")
end
if data.prolist[i] == "" then
self.proList[index][i].go.gameObject:SetActive(false)
else
self.proList[index][i].go.gameObject:SetActive(true)
- self.proList[index][i].goText.text = data.prolist[i]
+ self.proList[index][i].goText.text = data.prolist[i]
+ end
+ if i%3 == 0 then
+ self.proList[index][i].fenge.gameObject:SetActive(true)
+ else
+ self.proList[index][i].fenge.gameObject:SetActive(false)
end
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index eb0b6f9b6a..a312a3d45e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -666,7 +666,7 @@ function this.ExecuteLoading()
function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图
function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip
- function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,--跨服天梯
+ --function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,--跨服天梯
function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包
function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,--心愿魂印
function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜