Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-15 13:41:44 +08:00
commit 9e23f56e00
13 changed files with 92 additions and 0 deletions

View File

@ -1270,6 +1270,7 @@ RectTransform:
- {fileID: 6915957981708804506}
- {fileID: 1190590139372792719}
- {fileID: 564673211503656764}
- {fileID: 6061714661811268127}
m_Father: {fileID: 284124671445006370}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -11740,6 +11741,80 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 0
--- !u!1 &5462165279819459809
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6061714661811268127}
- component: {fileID: 9002965676615329166}
- component: {fileID: 8056307924240353259}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6061714661811268127
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5462165279819459809}
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: 1085493304771748058}
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: 66.1, y: 86.5}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9002965676615329166
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5462165279819459809}
m_CullTransparentMesh: 0
--- !u!114 &8056307924240353259
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5462165279819459809}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &5598499969135910784
GameObject:
m_ObjectHideFlags: 0

View File

@ -17,6 +17,7 @@ function FindTreasureMainPanel:InitComponent()
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
self.helpPos = Util.GetGameObject(self.gameObject, "helpBtn"):GetComponent("RectTransform").localPosition
self.findTreasureVipBtn = Util.GetGameObject(self.gameObject, "FindTreasureVipBtn")
self.findTreasureVipBtnRedPoint = Util.GetGameObject(self.gameObject, "FindTreasureVipBtn/redPoint")
self.allGetBtn = Util.GetGameObject(self.gameObject, "allGetBtn")
self.findTreasureGridGo = Util.GetGameObject(self.gameObject, "rect/rect (1)/grid")
self.rewardPre = Util.GetGameObject(self.gameObject, "rewardPre")
@ -66,6 +67,8 @@ function FindTreasureMainPanel:BindEvent()
end)
Util.AddClick(self.findTreasureVipBtn, function()
UIManager.OpenPanel(UIName.FindTreasureVipPopup)
FindTreasureManager.SetShowFindTreasureVipRedPoint(false)
self.findTreasureVipBtnRedPoint:SetActive(FindTreasureManager.GetShowFindTreasureVipRedPoint())
end)
Util.AddClick(self.refreshBtn, function()
if refreshIsMaterial then
@ -245,6 +248,13 @@ function FindTreasureMainPanel:OnShowPanelData(isSort)
self.refreshNumText.text = RefreshItemNum
self.refreshImage.sprite=Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,mazeTreasureSetting.RefreshItem[1]).ResourceID))
local gaoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.GoFindTreasure)
local haoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.HaoFindTreasure)
if gaoState and haoState then
FindTreasureManager.SetShowFindTreasureVipRedPoint(false)
end
self.findTreasureVipBtnRedPoint:SetActive(FindTreasureManager.GetShowFindTreasureVipRedPoint())
end
--活动奖励2

View File

@ -5,6 +5,7 @@ this.refreshTicketItemId = ConfigManager.GetConfigData(ConfigName.MazeTreasureSe
this.FindTreasureGaoId = 81--高级寻宝
this.FindTreasureHaoId = 82--豪华寻宝
this.materialItemId = 79--寻龙玦
this.isShowFindTreasureVipRedPoint = true
function this.Initialize()
allMissionUpHeros = {}
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshUsedTimes)
@ -42,4 +43,10 @@ function this.RefreshFindTreasureRedPoint()
end
return false
end
function this.SetShowFindTreasureVipRedPoint(isShow)
this.isShowFindTreasureVipRedPoint = isShow
end
function this.GetShowFindTreasureVipRedPoint()
return this.isShowFindTreasureVipRedPoint
end
return this

Binary file not shown.

Binary file not shown.