好感度提交

dev_chengFeng
jiaoyangna 2021-09-26 21:32:04 +08:00
parent d39ef472dc
commit 3a5e3cf17e
13 changed files with 159 additions and 86 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3893d1ea2164ccf4281d8d3f848ca202
guid: a10b70ed0605a3341910d6073eb2e103
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9408016a9c5e94f4e9a8fe63590404a7
spriteID: b33eb0f381d6dcd4ab9f934a468c14f6
vertices: []
indices:
edges: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 4, y: 39, z: 5, w: 40}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 108, y: 68, z: 112, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 469, y: 87, z: 465, w: 88}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -109,7 +109,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: 0, y: 0.00007695533}
m_AnchoredPosition: {x: 0, y: 0.00003435052}
m_SizeDelta: {x: 925.1, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2443668873975028990
@ -183,7 +183,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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 143.56}
m_SizeDelta: {x: 586.9, y: 258.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &427987219057071297
@ -333,7 +333,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: 0.000004479818, y: -0.000046788646}
m_AnchoredPosition: {x: 0.000004479818, y: 0.000034399924}
m_SizeDelta: {x: 924.2, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2775142083553738788
@ -368,7 +368,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_Spacing: 90
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -790,7 +790,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3373193103947791580
RectTransform:
m_ObjectHideFlags: 0
@ -808,9 +808,9 @@ RectTransform:
m_Father: {fileID: 932376224564149815}
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: 275.64, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6207175487511199908
@ -820,7 +820,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1723933262280676722}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -830,7 +830,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_ChildAlignment: 3
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
@ -1057,7 +1057,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7612208493574075147
RectTransform:
m_ObjectHideFlags: 0
@ -1074,9 +1074,9 @@ RectTransform:
m_Father: {fileID: 6383449964992838374}
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 67.5, y: -67.5}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3583722796192179126
@ -1115,7 +1115,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 925.1, y: 257.6}
m_SizeDelta: {x: 980, y: 257.6}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &8309868526075451557
MonoBehaviour:
@ -1734,7 +1734,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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 144.92}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5778419981250962112
@ -1903,7 +1903,7 @@ MonoBehaviour:
m_Padding:
m_Left: 80
m_Right: 0
m_Top: 74
m_Top: 93
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: -9.98
@ -1997,11 +1997,11 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: New Text
--- !u!1 &6312564577378405425
@ -2142,7 +2142,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 12.9
m_Spacing: 35
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -2176,7 +2176,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4786197492143541674
RectTransform:
m_ObjectHideFlags: 0
@ -2191,10 +2191,10 @@ RectTransform:
m_Father: {fileID: 5283082049955171346}
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: 462.55, y: -85}
m_SizeDelta: {x: 130, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6824175088076126020
GameObject:
@ -2229,10 +2229,10 @@ RectTransform:
m_Father: {fileID: 3373193103947791580}
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: 100, y: 100}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 138, y: 52}
m_Pivot: {x: 0, y: 0}
--- !u!222 &554498780250852566
CanvasRenderer:
@ -2262,7 +2262,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 5e66e46bf0e737d4799e4e225f0f5a5d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2606,10 +2606,10 @@ RectTransform:
m_Father: {fileID: 3373193103947791580}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 345.64, y: 0}
m_SizeDelta: {x: 205.64, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 242, y: -97.5}
m_SizeDelta: {x: 179, y: 47}
m_Pivot: {x: 0, y: 0}
--- !u!222 &4727830957886342103
CanvasRenderer:
@ -2649,10 +2649,10 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: New Text
m_Text:
--- !u!114 &7130449306859413999
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2660,12 +2660,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7863336960982840397}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &8173076154655527794
GameObject:
@ -2795,10 +2795,10 @@ MonoBehaviour:
m_Padding:
m_Left: 80
m_Right: 0
m_Top: 74
m_Bottom: 0
m_Top: 20
m_Bottom: 60
m_ChildAlignment: 0
m_Spacing: -9.98
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -2959,10 +2959,10 @@ RectTransform:
m_Father: {fileID: 3373193103947791580}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 120, y: 0}
m_SizeDelta: {x: 205.64, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 138, y: -94}
m_SizeDelta: {x: 90.5, y: 46}
m_Pivot: {x: 0, y: 0}
--- !u!222 &4254684229021910898
CanvasRenderer:
@ -3005,7 +3005,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: New Text
m_Text:
--- !u!114 &8334007990201709644
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3013,10 +3013,10 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9192581918767064148}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_HorizontalFit: 2
m_VerticalFit: 2

View File

@ -3289,7 +3289,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: 0, y: -1.0475}
m_AnchoredPosition: {x: 0, y: 10.79}
m_SizeDelta: {x: 127, y: 120.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2285869320661923719
@ -3313,7 +3313,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -3323,7 +3323,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 100
@ -3333,7 +3333,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
m_Text: 88
--- !u!1 &6256473394043693734
GameObject:
m_ObjectHideFlags: 0
@ -3591,7 +3591,7 @@ RectTransform:
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: 125, y: 123}
m_SizeDelta: {x: 128, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3491426057908555132
CanvasRenderer:
@ -3621,7 +3621,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c0b3bf3c739b5874aa4ccb849bd2ba74, type: 3}
m_Sprite: {fileID: 21300000, guid: a10b70ed0605a3341910d6073eb2e103, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -1952,7 +1952,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4753211590647630719
RectTransform:
m_ObjectHideFlags: 0

View File

@ -1077,7 +1077,7 @@ JumpType = {
JumpServerHightLadder = 82,--灵兽山
HongMengZhen = 86,-- 鸿蒙阵
FightLevel = 107,-- 山河社稷图
likeability = 114,
BuyVigor = 10000, --体力购买
BuyGold = 10001, --金币购买
Privilege = 10003, -- 特权

View File

@ -125,28 +125,31 @@ function FightAreaRewardPopup:OnShow()
str1 = str1 .. string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, v))
end
data.content = str1
data.type = 1
this.PriAdapter(num,data)
num = num + 1
end
if vipLv > 0 then
local data = {}
data.sprite = "h_haogandu_aixin"
data.sprite = "r_zjm_tequanpaizi"
data.iconText = "特权"
data.lv = vipLv..""
local value = 0
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,1)
local config = ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,1)
for i = 1,#config.Condition do
if config.Condition[i][1] == vipLv then
value = config.Condition[i][2]
end
end
data.content = string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, value))
data.type = 2
this.PriAdapter(num,data)
num = num + 1
end
end
ForceRebuildLayout(this.scroller.transform)
ForceRebuildLayout(this.extraRewardGrid.transform)
end
function this.PriAdapter(num,data)
@ -156,11 +159,14 @@ function this.PriAdapter(num,data)
_ExtraRewardList[num].icon = Util.GetGameObject(_ExtraRewardList[num].go, "icon"):GetComponent("Image")
_ExtraRewardList[num].lv = Util.GetGameObject(_ExtraRewardList[num].go, "lv"):GetComponent("Text")
_ExtraRewardList[num].content = Util.GetGameObject(_ExtraRewardList[num].go, "content"):GetComponent("Text")
_ExtraRewardList[num].iconText = Util.GetGameObject(_ExtraRewardList[num].icon, "Text"):GetComponent("Text")
_ExtraRewardList[num].iconText = Util.GetGameObject(_ExtraRewardList[num].icon.transform, "Text"):GetComponent("Text")
end
_ExtraRewardList[num].go.gameObject:SetActive(true)
_ExtraRewardList[num].icon.sprite = this.spLoader:LoadSprite(data.sprite)
_ExtraRewardList[num].icon:SetNativeSize()
if data.type == 1 then
_ExtraRewardList[num].icon.transform:GetComponent("RectTransform").sizeDelta = Vector2.New(71,65)
end
_ExtraRewardList[num].lv.text = data.lv
_ExtraRewardList[num].content.text = data.content
_ExtraRewardList[num].iconText.text = data.iconText

View File

@ -776,6 +776,9 @@ local jumpDic = {
[JumpType.linglongShangShi] = function(data)
this.JumpActivity(JumpType.linglongShangShi,data[1])
end,
[JumpType.likeability] = function()
UIManager.OpenPanel(UIName.LikeAbilityPanel)
end,
}
function this.JumpActivity(data,skipfactor)

View File

@ -40,7 +40,8 @@ function RoleListPanel:InitComponent()
--this.fenJieBtn:SetActive(false)
this.formationBtn = Util.GetGameObject(self.gameObject, "formationBtn")
this.haogandu = Util.GetGameObject(self.gameObject, "haogandu")
this.haogandu.gameObject:SetActive(false)
this.haoganduLv = Util.GetGameObject(this.haogandu, "lv"):GetComponent("Text")
--this.haogandu.gameObject:SetActive(false)
this.haoganduRed = Util.GetGameObject(this.treeBtn, "redPoint")
if not this.playerInfoView then
@ -96,11 +97,11 @@ function RoleListPanel:BindEvent()
end)
Util.AddClick(this.fenJieBtn, function()
UIManager.OpenPanel(UIName.HandBookHeroAndEquipListPanel,1)
--if ActTimeCtrlManager.SingleFuncState(24) then
-- if ActTimeCtrlManager.SingleFuncState(24) then
-- UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel,1)
--else
-- else
-- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(24))
--end
-- end
end)
Util.AddClick(this.formationBtn, function()
if ActTimeCtrlManager.SingleFuncState(54) then
@ -162,11 +163,11 @@ function RoleListPanel:OnShow()
sortType = HeroManager.heroListPanelSortID
proId = HeroManager.heroListPanelProID
this:GetCurSortHeroListData()
--if ActTimeCtrlManager.SingleFuncState(24) then
-- if ActTimeCtrlManager.SingleFuncState(24) then
-- Util.SetGray(this.fenJieBtn, false)
--else
--Util.SetGray(this.fenJieBtn, true)
--end
-- else
-- Util.SetGray(this.fenJieBtn, true)
-- end
if ActTimeCtrlManager.SingleFuncState(54) then
Util.SetGray(this.formationBtn, false)
else
@ -177,7 +178,9 @@ function RoleListPanel:OnShow()
-- end
-- 刷新一次编队战斗力
FormationManager.RefreshMainFormationPower()
--this.haogandu.gameObject:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility))
local totalCurNum,totalLv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1)
this.haoganduLv.text = totalLv
this.haogandu.gameObject:SetActive(true)--ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility))
end

View File

@ -129,6 +129,34 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
this.jumpBtn:SetActive(_guildSkill == nil)
end
local lv = LikabilityManager.GetTotalHeroLikeLv(_configData.Id)
local pro = LikabilityManager.GetProData(2,-1,lv)
if not this.specialPro then
this.specialPro = {}
end
for i = 1,#this.specialPro do
this.specialPro.go.gameObject:SetActive(false)
end
if pro and LengthOfTable(pro) > 0 then
this.thirdlyGridP:SetActive(true)
for k,v in pairs(pro) do
if not this.specialPro[k] then
this.specialPro[k] = {}
this.specialPro[k].go = newObjToParent(this.proPre2,this.thirdlyGrid)
this.specialPro[k].jumpBtn = Util.GetGameObject(this.specialPro[k].go, "jumpBtn")
this.specialPro[k].guildProName = Util.GetGameObject(this.specialPro[k].go, "proName"):GetComponent("Text")
this.specialPro[k].guildProValue = Util.GetGameObject(this.specialPro[k].go, "proVale"):GetComponent("Text")
end
this.specialPro[k].guildProName.text = "好感度-"..propertyConfig[k].Info
this.specialPro[k].guildProValue.text = v
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
this.specialPro[k].jumpBtn:SetActive(_guildSkill == nil)
Util.AddOnceClick(this.specialPro[k].jumpBtn, function()
JumpManager.GoJump(40033)
end)
end
end
end
--界面关闭时调用(用于子类重写)
function RoleProInfoPopup:OnClose()
@ -138,7 +166,7 @@ end
--界面销毁时调用(用于子类重写)
function RoleProInfoPopup:OnDestroy()
this.spLoader:Destroy()
this.specialPro = {}
ProGoList = nil
end