探索提交

dev_chengFeng
jiaoyangna 2021-12-27 16:16:56 +08:00
parent bef8340c7c
commit 9e47928008
5 changed files with 36 additions and 34 deletions

View File

@ -835,12 +835,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3728230877015198153}
m_Father: {fileID: 1880521797328049326}
m_RootOrder: 2
m_Father: {fileID: 6875560361487186785}
m_RootOrder: 3
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: -2.8, y: -71.7}
m_AnchoredPosition: {x: -15.3, y: -15.199997}
m_SizeDelta: {x: 325, y: 35.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5966816408531613893
@ -1394,7 +1394,6 @@ RectTransform:
m_Children:
- {fileID: 6105355657785293294}
- {fileID: 6875560361487186785}
- {fileID: 538652110183025926}
m_Father: {fileID: 2551601507637919127}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2312,6 +2311,7 @@ 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

@ -152,7 +152,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1917384259204399052
CanvasRenderer:
@ -787,7 +787,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: 5e6dd4cae84f4dd46958013a6f282fc7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1653,7 +1653,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3680545875719326723
CanvasRenderer:
@ -1683,7 +1683,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: e5f390065e8d312419f17562e8250e91, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3115,7 +3115,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 450, y: -104}
m_SizeDelta: {x: 900, y: 0}
m_SizeDelta: {x: 900, y: 250}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &4991609003910263707
MonoBehaviour:
@ -3415,7 +3415,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: af35ae40293e26b41b46837f7ad59918, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4728,7 +4728,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: e5f390065e8d312419f17562e8250e91, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4912,7 +4912,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: 29430791031a92643b0afc46b730abe5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5582,7 +5582,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: f088797d2a26ab24abe877e97eba98bd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6245,7 +6245,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4753622421415352171
CanvasRenderer:
@ -6275,7 +6275,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: 5e6dd4cae84f4dd46958013a6f282fc7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8487,7 +8487,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1307786319315946796
CanvasRenderer:
@ -8517,7 +8517,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: f088797d2a26ab24abe877e97eba98bd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -9212,7 +9212,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3005977404129422590
CanvasRenderer:
@ -9242,7 +9242,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: 29430791031a92643b0afc46b730abe5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -11794,7 +11794,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: 50, y: 69}
m_SizeDelta: {x: 38.77, y: 53.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2695649938142890498
CanvasRenderer:
@ -11824,7 +11824,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: b582673e3da23f44fbae9ec0521af1f1, type: 3}
m_Sprite: {fileID: 21300000, guid: af35ae40293e26b41b46837f7ad59918, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -12402,7 +12402,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5457873113540345585
RectTransform:
m_ObjectHideFlags: 0
@ -12808,7 +12808,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -4.55, y: 0.29}
m_AnchoredPosition: {x: -4.549999, y: 0.29000092}
m_SizeDelta: {x: 31.14, y: 20.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7951897889858441187

View File

@ -159,7 +159,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,"condition")
self.mapList[k].condition = Util.GetGameObject(self.mapList[k].mapInfo,"info/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
@ -173,8 +173,10 @@ function ExploreMainPanel:SetMapData()
if PlayerManager.level < v.openLevel then
self.mapList[k].condition.gameObject:SetActive(true)
self.mapList[k].conditionTip.text = v.openLevel.."级解锁"
self.mapList[k].minForce.gameObject:SetActive(false)
Util.SetGray(self.mapList[k].bgName,true)
else
self.mapList[k].minForce.gameObject:SetActive(true)
self.mapList[k].condition.gameObject:SetActive(false)
Util.SetGray(self.mapList[k].bgName,false)
end

View File

@ -118,7 +118,7 @@ function this:OnShow(_parent,...)
this.itemList[i].heroList = {}
for j = 1,6 do
this.itemList[i].heroList[j] = {}
this.itemList[i].heroList[j].go = Util.GetGameObject(this.itemList[i].scroll, "heroPro ("..j..")")
this.itemList[i].heroList[j].go = Util.GetGameObject(this.itemList[i].scroll, "heroPro"..j)
this.itemList[i].heroList[j].frame = Util.GetGameObject( this.itemList[i].heroList[j].go, "frame"):GetComponent("Image")
this.itemList[i].heroList[j].hero = Util.GetGameObject( this.itemList[i].heroList[j].go, "hero")
this.itemList[i].heroList[j].icon = Util.GetGameObject( this.itemList[i].heroList[j].hero, "icon"):GetComponent("Image")

View File

@ -166,11 +166,11 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data)
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil,sortingorder)
self.playerLiveView:RemoveTitleCanvas()
self.nameDi.gameObject:SetActive(false)
--如果修行开启设置修行标识
if ActTimeCtrlManager.SingleFuncState(108) then
self.PracticeIcon:SetActive(true)
PracticeManager.SetPracticeIcon(self.PracticeIcon,PracticeManager.PracticeLevel)
end
-- --如果修行开启设置修行标识
-- if ActTimeCtrlManager.SingleFuncState(108) then
-- self.PracticeIcon:SetActive(true)
-- PracticeManager.SetPracticeIcon(self.PracticeIcon,PracticeManager.PracticeLevel or 1)
-- end
self.blood:SetActive(true)
local hp = ExploreManager.GetHpById(data.formationId)
if hp <= 0 then
@ -201,10 +201,10 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data)
self.name.text = data.userName or data.name
self.nameDi.gameObject:SetActive(true)
local _lv = data.lv or data.level or data.userLevel
if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then
self.PracticeIcon:SetActive(true)
PracticeManager.SetPracticeIcon(self.PracticeIcon,data.practiceLevel)
end
-- if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then
-- self.PracticeIcon:SetActive(true)
-- PracticeManager.SetPracticeIcon(self.PracticeIcon,data.practiceLevel)
-- end
self.blood:SetActive(false)
end
self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2)