探索中修改提交

dev_chengFeng
jiaoyangna 2021-12-29 14:53:45 +08:00
parent d91afe4326
commit 4318b37891
2 changed files with 42 additions and 84 deletions

View File

@ -1091,80 +1091,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &2985671166249418088
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5540647608522149965}
- component: {fileID: 2579407824971701164}
- component: {fileID: 5542281000289817628}
m_Layer: 5
m_Name: ima1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5540647608522149965
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2985671166249418088}
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: 5446418940014741044}
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: 0, y: 0}
m_SizeDelta: {x: 112, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2579407824971701164
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2985671166249418088}
m_CullTransparentMesh: 0
--- !u!114 &5542281000289817628
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2985671166249418088}
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: 19f184c33d6b1fe43883dc621e36613f, 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 &3063400038253272979
GameObject:
m_ObjectHideFlags: 0
@ -2541,7 +2467,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5540647608522149965}
- {fileID: 3496576134404402255}
- {fileID: 3092005644335171559}
m_Father: {fileID: 6875560361487186785}
@ -2580,7 +2505,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: 9d763b426b1b70b40aedd4a1c8a181b4, type: 3}
m_Sprite: {fileID: 21300000, guid: 19f184c33d6b1fe43883dc621e36613f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2675,7 +2600,7 @@ GameObject:
- component: {fileID: 4256677153118309311}
- component: {fileID: 89713659492463398}
m_Layer: 5
m_Name: ima3
m_Name: ima2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -2693,7 +2618,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5446418940014741044}
m_RootOrder: 2
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}
@ -3311,7 +3236,7 @@ GameObject:
- component: {fileID: 302265699671637550}
- component: {fileID: 7681368151514513578}
m_Layer: 5
m_Name: ima2
m_Name: ima1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -3329,7 +3254,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5446418940014741044}
m_RootOrder: 1
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}

View File

@ -1,6 +1,6 @@
require("Base/BasePanel")
ExploreMainPanel = Inherit(BasePanel)
local pointnum = 2
--初始化组件(用于子类重写)
function ExploreMainPanel:InitComponent()
self.spLoader = SpriteLoader.New()
@ -170,7 +170,12 @@ function ExploreMainPanel:SetMapData()
self.mapList[k].canGetImg.gameObject:SetActive(true)
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].exploreIma = Util.GetGameObject(self.mapList[k].mapInfo,"info/explore")
self.mapList[k].exploreList = {}
for i = 1,pointnum do
self.mapList[k].exploreList[i] = Util.GetGameObject(self.mapList[k].exploreIma,"ima"..i)
end
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")
@ -208,9 +213,33 @@ function ExploreMainPanel:SetMapData()
end
function ExploreMainPanel:SetMapState()
for k,v in pairs(self.mapList) do
v.exploreIma.gameObject:SetActive(LengthOfTable(v.data.formations) > 0)
if self.timer then
self.timer:Stop()
self.timer = nil
end
local s = function()
for k,v in pairs(self.mapList) do
if v.data.state > 0 then
v.exploreIma.gameObject:SetActive(true)
local index = 0
for i = 1,#self.mapList[k].exploreList do
self.mapList[k].exploreList[i].gameObject:SetActive(false)
end
Timer.New(function()
if self.mapList[k].exploreList[index] then
self.mapList[k].exploreList[index].gameObject:SetActive(false)
end
index = (index + 1)%pointnum == 0 and pointnum or (index + 1)%pointnum
self.mapList[k].exploreList[index].gameObject:SetActive(true)
end,0.25,2):Start()
else
v.exploreIma.gameObject:SetActive(false)
end
end
end
s()
self.timer = Timer.New(s,1,-1,false)
self.timer:Start()
end
function ExploreMainPanel:SetTip(root,k)
@ -229,6 +258,10 @@ end
--界面关闭时调用(用于子类重写)
function ExploreMainPanel:OnClose()
self:SetTip(self.tipRoot,self.mapId)
if self.timer then
self.timer:Stop()
self.timer = nil
end
end
--界面销毁时调用(用于子类重写)