root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

红点提交

dev_chengFeng
jiaoyangna 2021-03-23 16:52:19 +08:00
parent 001d6e16bc
commit 44806a302d
8 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab
View File

@ -2280,8 +2280,8 @@ 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: 68.42, y: 40.4}
m_SizeDelta: {x: 15, y: 15}
m_AnchoredPosition: {x: 64.64497, y: 37.034996}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1536775684161593866
CanvasRenderer:

4
Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
View File

@ -584,7 +584,7 @@ function this.BindRedPoint()
BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
BindRedPointObject(RedPointType.TianShuMiJuan,this.btnTianShuMiJuan)
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
end
-- 绑定红点
function this.ClearRedPoint()
@ -603,7 +603,7 @@ function this.ClearRedPoint()
ClearRedPointObject(RedPointType.DiffMonster, this.rpYiYao)
ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
ClearRedPointObject(RedPointType.TianShuMiJuan,this.btnTianShuMiJuan)
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
end
--添加事件监听（用于子类重写）

4
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
View File

@ -462,8 +462,8 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint)
RPData:AddCheckFunc(RedPointType.Hero_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.SoulPrint_Fetter,TianShuMiJuanManger.RefreshPokemonFetterRedPoint)
RPData:AddCheckFunc(RedPointType.TianShuPokemon_Fetter,TianShuMiJuanManger.RefreshPokemonFetterRedPoint)
RPData:AddCheckFunc(RedPointType.SoulPrint_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.TianShuPokemon_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.HongMeng_Evory,HarmonyManager.RefreshEnvoyPoint)
RPData:AddCheckFunc(RedPointType.HongMeng_OpenBox,HarmonyManager.RefreshOpenBoxPoint)

10
Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua
View File

@ -37,16 +37,12 @@ function this.Initialize()
end
function this.UpdateAllHavedSoulPrint(allSoulPrint)
local isCheck = false
for i = 1 ,#allSoulPrint do
if not this.allHavedSoulPrint[allSoulPrint] then
isCheck = true
this.allHavedSoulPrint[allSoulPrint] = allSoulPrint
if not this.allHavedSoulPrint[allSoulPrint[i]] then
this.allHavedSoulPrint[allSoulPrint[i]] = allSoulPrint[i]
end
end
if isCheck then
TianShuMiJuanManger.CheckFetterStatus(2)
end
TianShuMiJuanManger.CheckFetterStatus(2)
end
function this.GetAllHavedSoulPrint()

1
Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua
View File

@ -212,6 +212,7 @@ function TianShuMiJuanMainPanel:OnDestroy()
for k,v in pairs(self.itemPreList) do
SubUIManager.Close(v)
end
SubUIManager.Close(self.scroll)
self.itemPreList = {}
redPointList = {}
end

4
Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua
View File

@ -101,11 +101,11 @@ end
function this.CheckRedPoint(fetterType)
for k,v in pairs(this.fetterData) do
if v.fetterType == fetterType and v.enabled == 0 then
LogGreen("fetterType:"..fetterType.." 红点亮了")
LogGreen(fetterType.." 红点亮了")
return true
end
end
LogGreen("fetterType:"..fetterType.." 红点灰了")
LogGreen(fetterType.." 红点暗了")
return false
end

6
Assets/ManagedResources/~Lua/View/FetterItem.lua
View File

@ -91,6 +91,8 @@ function FetterItem:SetIcon(status)
else
self.activeBtn.gameObject:SetActive(true)
self.active.gameObject:SetActive(false)
self.activeBtnRed.gameObject:SetActive(false)
Util.SetGray(self.activeBtn,false)
if status == 0 then
Util.SetGray(self.activeBtn,false)
self.activeBtnRed.gameObject:SetActive(true)
@ -104,13 +106,9 @@ function FetterItem:SetIcon(status)
end
function FetterItem:OnClose()
end
function FetterItem:OnDestroy()
for i = 1, #self.itemList do
SubUIManager.Close(self.itemList[i])
end
self.itemList = {}
end
return FetterItem

14
Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
View File

@ -197,16 +197,16 @@ function ScrollCycleView:InitComponent()
self.OnEndDragNew= function(p,d)
OnEndDrag(self,p,d)
end
-- self.trigger = Util.GetEventTriggerListener(self.gameObject)
-- self.trigger.onBeginDrag = self.trigger.onBeginDrag + self.OnBeginDragNew
-- self.trigger.onDrag = self.trigger.onDrag + self.OnDragNew
-- self.trigger.onEndDrag = self.trigger.onEndDrag + self.OnEndDragNew
self.trigger = Util.GetEventTriggerListener(self.gameObject)
self.trigger.onBeginDrag = self.trigger.onBeginDrag + self.OnBeginDragNew
self.trigger.onDrag = self.trigger.onDrag + self.OnDragNew
self.trigger.onEndDrag = self.trigger.onEndDrag + self.OnEndDragNew
--self.trigger = Util.GetEventTriggerListener(self.gameObject)
self.isCanDrag = true
self.isBeginDrag = false
self.trigger.onBeginDrag = self.trigger.onBeginDrag + function (p,d) OnBeginDrag(self,p,d) end
self.trigger.onDrag = self.trigger.onDrag + function (p,d) OnDrag(self,p,d) end
self.trigger.onEndDrag = self.trigger.onEndDrag + function (p,d) OnEndDrag(self,p,d) end
-- self.trigger.onBeginDrag = self.trigger.onBeginDrag + function (p,d) OnBeginDrag(self,p,d) end
-- self.trigger.onDrag = self.trigger.onDrag + function (p,d) OnDrag(self,p,d) end
-- self.trigger.onEndDrag = self.trigger.onEndDrag + function (p,d) OnEndDrag(self,p,d) end
self.rectTransform = self.gameObject:GetComponent("RectTransform")