Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-03-31 14:29:26 +08:00
commit 50fcc0e03b
5 changed files with 519 additions and 448 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -3434,16 +3434,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 186607428668674391}
m_Modifications:
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Name
value: UI_Effect_MianBan_LiBao_button_01
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalPosition.x
@ -3507,7 +3497,7 @@ PrefabInstance:
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: 24.135
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
@ -3517,27 +3507,27 @@ PrefabInstance:
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 48.27
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
@ -3549,6 +3539,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Name
value: UI_Effect_MianBan_LiBao_button_01
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ee9304e5f1d403d4ea55d2f19fafa324, type: 3}
--- !u!224 &4744428278025829081 stripped

View File

@ -111,14 +111,27 @@ function this.RefreshPanel()
o.name="Pre"..i
preList[i]=o
end
local guildName=Util.GetGameObject(o,"Guild/GuildName"):GetComponent("Text")
local guildName=Util.GetGameObject(o,"Guild/mask/GuildName"):GetComponent("Text")
local posName=Util.GetGameObject(o,"Name/Text"):GetComponent("Image")
local serverName=Util.GetGameObject(o,"serverName/Text"):GetComponent("Text")
serverName.text=""
guildName.text=""
posName.sprite=Util.LoadSprite(guildWarConfig[i].Pic)--guildWarConfig[i].Name
preList[i].transform.localPosition=Vector2.New(d[i].pos[1],d[i].pos[2])
Util.GetGameObject(o,"Guild"):SetActive(false)
Util.GetGameObject(o,"serverName"):SetActive(false)
end
local colorValue = Color.New(1,1,1,0)
DoTween.To(
DG.Tweening.Core.DOGetter_float( function () return 0 end),
DG.Tweening.Core.DOSetter_float(function (progress)
Log(progress)
colorValue.a = progress
for i = 1, 10 do
Util.GetGameObject(preList[i],"Name/Text"):GetComponent("Image").color = colorValue
end
end),
1, 0.5):SetEase(Ease.Linear):OnComplete(function() end)
NetManager.GetDeathPathInfoResponse(function(msg)
if DeathPosManager.status==DeathPosStatus.Reward then
this.overTime.text=Language[11029]
@ -138,8 +151,9 @@ function this.RefreshPanel()
--各阵型点击事件
for i = 1, #preList do
Util.AddOnceClick(preList[i],function()
local guildName=Util.GetGameObject(preList[i],"Guild/GuildName"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text)
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
--local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text)--,serverName.text)
end)
end
end
@ -171,9 +185,17 @@ function this.RefreshGuildInfo()
for key, value in pairs(data) do
if i==value.pathId then
local guild=Util.GetGameObject(preList[i],"Guild")
local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
local guildImage=guild:GetComponent("Image")
local guildName=Util.GetGameObject(preList[i],"Guild/GuildName"):GetComponent("Text")
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
guild:SetActive(true)
-- if value.serverName and value.serverName ~= "" then
-- serverName.text = value.serverName
-- else
-- Util.GetGameObject(preList[i],"serverName"):SetActive(false)
-- serverName.text = ""
-- end
guildName.text=value.guildName
--如果是自己的公会
guildImage.sprite= value.gid==PlayerManager.familyId and Util.LoadSprite(_image[2]) or Util.LoadSprite(_image[1])