Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-06-19 15:46:05 +08:00
commit d11833e088
2 changed files with 7 additions and 7 deletions

View File

@ -312,7 +312,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -677,7 +677,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.2509804}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -825,7 +825,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -21,7 +21,7 @@ function UpStarPre:InitComponent()
self.redPoint = Util.GetGameObject(self.middleLayout, "scroller2/redPoint")
self.grid1 = Util.GetGameObject(self.middleLayout, "grid1")
self.grid2 = Util.GetGameObject(self.middleLayout, "scroller2/grid2")
self.GetBtn = Util.GetGameObject(self.middleLayout, "scroller2/GetBtn"):GetComponent("Button")
self.GetBtn = Util.GetGameObject(self.middleLayout, "scroller2/GetBtn")
self.grid3 = Util.GetGameObject(self.middleLayout, "scroller3/grid3")
self.grid3 = Util.GetGameObject(self.middleLayout, "scroller3/grid3")
self.itemPre = Util.GetGameObject(self.middleLayout, "itemPre")
@ -42,7 +42,7 @@ function UpStarPre:BindEvent()
end)
end)
Util.AddOnceClick(self.GetBtn.gameObject, function()
Util.AddOnceClick(self.GetBtn, function()
NetManager.GetActivityRewardRequest(self.data.missionId,self.actData.activityId,function(msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1)
self.data.state = 2
@ -158,10 +158,10 @@ function UpStarPre:SetBtn1()
end
end
if self.data.state == 1 then
self.GetBtn.enabled = true
self.GetBtn.gameObject:SetActive(true)
self.redPoint.gameObject:SetActive(true)
else
self.GetBtn.enabled = false
self.GetBtn.gameObject:SetActive(false)
self.redPoint.gameObject:SetActive(false)
end
end