名字提交
parent
9cf2502a10
commit
1e04dcc200
|
@ -293,16 +293,16 @@ MonoBehaviour:
|
||||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||||
m_FontSize: 34
|
m_FontSize: 34
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 1
|
||||||
m_MinSize: 0
|
m_MinSize: 20
|
||||||
m_MaxSize: 300
|
m_MaxSize: 34
|
||||||
m_Alignment: 0
|
m_Alignment: 0
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5764\u54E5\u5764\u54E5\u5764\u54E5\u5764\u54E5\u5764\u54E5"
|
m_Text: "\u83B7\u5F97\u66F4\u591A\u7684\u795E\u5C06\u5E76\u589E\u52A0\u5386\u7EC3"
|
||||||
--- !u!1 &4999992061623016917
|
--- !u!1 &4999992061623016917
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -110,8 +110,8 @@ function this:Init()
|
||||||
if not this.playerViews[0] then
|
if not this.playerViews[0] then
|
||||||
--LogGreen(m_curMapId)
|
--LogGreen(m_curMapId)
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.guajigongneng) then
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.guajigongneng) then
|
||||||
iconNum = 9
|
iconNum = 12
|
||||||
local randomNum = math.random(2, 4)
|
local randomNum = math.random(2,4)
|
||||||
PlayerManager.GetFightMapPlayerNPCData(randomNum,function(NPCList)
|
PlayerManager.GetFightMapPlayerNPCData(randomNum,function(NPCList)
|
||||||
--LogGreen("NPCList:"..LengthOfTable(NPCList))
|
--LogGreen("NPCList:"..LengthOfTable(NPCList))
|
||||||
local index = 1
|
local index = 1
|
||||||
|
@ -206,7 +206,7 @@ function this.SetPlayerViewWalk()
|
||||||
for k,v in pairs(this.playerViews) do
|
for k,v in pairs(this.playerViews) do
|
||||||
v:SetRoleHitTarget()
|
v:SetRoleHitTarget()
|
||||||
end
|
end
|
||||||
end,1)
|
end,1.5)
|
||||||
this.startTimer:Start()
|
this.startTimer:Start()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -232,11 +232,18 @@ function this.AsideTriggerJudge(data,isSelf,_userData)
|
||||||
if not this.threads then
|
if not this.threads then
|
||||||
this.threads = {}
|
this.threads = {}
|
||||||
end
|
end
|
||||||
if this.isClose then
|
if this.threads[_userData.userId] then
|
||||||
return
|
coroutine.stop(this.threads[_userData.userId])
|
||||||
|
this.threads[_userData.userId] = nil
|
||||||
end
|
end
|
||||||
this.threads[_userData.userId] = coroutine.start(function()
|
this.threads[_userData.userId] = coroutine.start(function()
|
||||||
while(not isGetIconList) do
|
while(not isGetIconList) do
|
||||||
|
if this.isClose and this.isClose == true then
|
||||||
|
coroutine.stop(this.threads[_userData.userId])
|
||||||
|
this.threads[_userData.userId] = nil
|
||||||
|
this.ReleaseIconList()
|
||||||
|
return
|
||||||
|
end
|
||||||
--LogGreen("没有得到访问权")
|
--LogGreen("没有得到访问权")
|
||||||
iconList = this.RequestIconList()
|
iconList = this.RequestIconList()
|
||||||
if iconList and LengthOfTable(iconList) > 0 then
|
if iconList and LengthOfTable(iconList) > 0 then
|
||||||
|
|
|
@ -7,6 +7,10 @@ local m_roleTextPos = {
|
||||||
[4] = {pos = Vector3.New(-177, 204, 0), angleOffset = 0} -- 反之
|
[4] = {pos = Vector3.New(-177, 204, 0), angleOffset = 0} -- 反之
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local namePos = {
|
||||||
|
[1] = {pos = Vector3.New(-1.86, 185.3, 0)}, -- 角色朝左,气泡在左
|
||||||
|
[2] = {pos = Vector3.New(154, 273.5, 0)} -- 反之
|
||||||
|
}
|
||||||
-- 老头对话气泡位置
|
-- 老头对话气泡位置
|
||||||
local m_oldManTextPos = {
|
local m_oldManTextPos = {
|
||||||
[3] = {pos = Vector3.New(-176, 130, 0), angleOffset = 0}, -- 角色朝左,气泡在左
|
[3] = {pos = Vector3.New(-176, 130, 0), angleOffset = 0}, -- 角色朝左,气泡在左
|
||||||
|
@ -162,10 +166,14 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
|
||||||
ride = data.userMount,
|
ride = data.userMount,
|
||||||
designation = data.userTitle,
|
designation = data.userTitle,
|
||||||
})
|
})
|
||||||
|
if data.userMount == 0 then
|
||||||
|
self.name.transform.localPosition = namePos[1].pos
|
||||||
|
else
|
||||||
|
self.name.transform.localPosition = namePos[2].pos
|
||||||
|
end
|
||||||
self.name.text = data.userName
|
self.name.text = data.userName
|
||||||
self.nameDi.gameObject:SetActive(true)
|
self.nameDi.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2)
|
self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2)
|
||||||
self.playerLiveView.name = "npc"
|
self.playerLiveView.name = "npc"
|
||||||
|
|
||||||
|
@ -524,7 +532,9 @@ function SingleFightPlayerView:SetIconShow(_eventpoint)
|
||||||
self.context.text = strList[num]
|
self.context.text = strList[num]
|
||||||
local boxPos = self.selectPointPos
|
local boxPos = self.selectPointPos
|
||||||
Timer.New(function()
|
Timer.New(function()
|
||||||
self:SetEffect(boxPos)
|
if self.state == 1 then
|
||||||
|
self:SetEffect(boxPos)
|
||||||
|
end
|
||||||
end,1.5):Start()
|
end,1.5):Start()
|
||||||
end
|
end
|
||||||
self:NotBattleShow()
|
self:NotBattleShow()
|
||||||
|
@ -552,8 +562,10 @@ function SingleFightPlayerView:SetIconShow(_eventpoint)
|
||||||
self.eventPointPos:SetDialogueStr(strList1[num])
|
self.eventPointPos:SetDialogueStr(strList1[num])
|
||||||
Timer.New(function()
|
Timer.New(function()
|
||||||
self.dialogueRoot.gameObject:SetActive(false)
|
self.dialogueRoot.gameObject:SetActive(false)
|
||||||
self.eventPointPos:ShowDialogue(true)
|
if self.state == 1 then
|
||||||
self:NotBattleShow()
|
self.eventPointPos:ShowDialogue(true)
|
||||||
|
self:NotBattleShow()
|
||||||
|
end
|
||||||
end,1):Start()
|
end,1):Start()
|
||||||
else
|
else
|
||||||
self:NotBattleShow()
|
self:NotBattleShow()
|
||||||
|
@ -787,6 +799,7 @@ function SingleFightPlayerView:StopAction()
|
||||||
end
|
end
|
||||||
|
|
||||||
function SingleFightPlayerView:OnClose()
|
function SingleFightPlayerView:OnClose()
|
||||||
|
self.dialogueRoot.gameObject:SetActive(false)
|
||||||
self:StopAction()
|
self:StopAction()
|
||||||
self.buffTipList = {}
|
self.buffTipList = {}
|
||||||
if self.playerLiveView then
|
if self.playerLiveView then
|
||||||
|
|
Loading…
Reference in New Issue