探索提交

dev_chengFeng
jiaoyangna 2021-12-28 15:31:46 +08:00
parent b40bd10a32
commit 5e75e2384e
5 changed files with 21 additions and 11 deletions

View File

@ -835,13 +835,13 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3728230877015198153}
m_Father: {fileID: 6875560361487186785}
m_RootOrder: 3
m_Father: {fileID: 7141107481546563702}
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: -15.3, y: -15.199997}
m_SizeDelta: {x: 325, y: 35.45}
m_AnchoredPosition: {x: -0.00019264, y: -53.195}
m_SizeDelta: {x: 298, y: 35.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5966816408531613893
CanvasRenderer:
@ -1509,6 +1509,7 @@ RectTransform:
m_Children:
- {fileID: 2357582555816903237}
- {fileID: 6981839850660148456}
- {fileID: 538652110183025926}
m_Father: {fileID: 6875560361487186785}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2311,7 +2312,6 @@ RectTransform:
- {fileID: 7141107481546563702}
- {fileID: 332833142006133951}
- {fileID: 5446418940014741044}
- {fileID: 538652110183025926}
m_Father: {fileID: 1880521797328049326}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -39552,7 +39552,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2636232613951527736
RectTransform:
m_ObjectHideFlags: 0
@ -39569,7 +39569,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: 35.4, y: 23.6}
m_AnchoredPosition: {x: 69.8, y: 58.5}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1641398796403596064

View File

@ -165,7 +165,7 @@ function ExploreMainPanel:SetMapData()
self.mapList[k].nameMask = Util.GetGameObject(self.mapList[k].mapInfo,"info/nameMask"):GetComponent("Text")
self.mapList[k].name = Util.GetGameObject(self.mapList[k].mapInfo,"info/nameMask/name"):GetComponent("Text")
self.mapList[k].exploreIma = Util.GetGameObject(self.mapList[k].mapInfo,"info/exploreIma")
self.mapList[k].condition = Util.GetGameObject(self.mapList[k].mapInfo,"info/condition")
self.mapList[k].condition = Util.GetGameObject(self.mapList[k].mapInfo,"info/bgName/condition")
self.mapList[k].conditionTip = Util.GetGameObject(self.mapList[k].condition,"Text"):GetComponent("Text")
self.mapList[k].tipPos = Util.GetGameObject(self.mapList[k].go,"tipPos")
end
@ -178,7 +178,11 @@ function ExploreMainPanel:SetMapData()
SetNumShow(self.mapList[k].minForce,self.mapList[k].force.gameObject,v.force)
if PlayerManager.level < v.openLevel then
self.mapList[k].condition.gameObject:SetActive(true)
self.mapList[k].conditionTip.text = v.openLevel.."级解锁"
if v.openLevel == 999 then
self.mapList[k].conditionTip.text = v.openLevel.."级解锁"
else
self.mapList[k].conditionTip.text = "地图暂未开放"
end
self.mapList[k].minForce.gameObject:SetActive(false)
Util.SetGray(self.mapList[k].bgName,true)
else

View File

@ -57,8 +57,13 @@ function this.On_Btn2_Click()
if not hadClick then
hadClick = true
for k,v in pairs(this.FormationData) do
FormationManager.SaveFormation(k, v.formationinfo,
FormationManager.formationList[k].teamPokemonInfos)
if k == this.GetFormationIndex() then
FormationManager.SaveFormation(k, this.root.choosedList,
FormationManager.formationList[k].teamPokemonInfos)
else
FormationManager.SaveFormation(k, v.formationinfo,
FormationManager.formationList[k].teamPokemonInfos)
end
end
end
end

View File

@ -1090,6 +1090,7 @@ function NetManager.ExplorerMapIndicationResponse(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.ExplorerMapIndicationResponse()
msg:ParseFromString(data)
LogGreen("收到了刷新探索编队的indication")
ExploreManager.UpdateFormationData(msg.exploreInfo)
Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation)
end