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

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

dev_chengFeng
jiaoyangna 2021-04-29 15:35:22 +08:00
parent 1da013efda b6366a970e
commit 73b094b9a4
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/ManagedResources/Prefabs/Map/UI_Map_XunBaoEffect_hit.prefab
View File

@ -4706,7 +4706,7 @@ ParticleSystem:
--- !u!199 &1113217062395620073
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -4741,7 +4741,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 205
m_SortingOrder: 1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -9398,7 +9398,7 @@ ParticleSystem:
--- !u!199 &4815148930500829943
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9433,7 +9433,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -14055,7 +14055,7 @@ ParticleSystem:
--- !u!199 &1940909402510411175
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14090,7 +14090,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -18793,7 +18793,7 @@ ParticleSystem:
--- !u!199 &3145150861859057568
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -18828,7 +18828,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 1
m_SortMode: 0
m_MinParticleSize: 0
@ -23450,7 +23450,7 @@ ParticleSystem:
--- !u!199 &8324614838058179502
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23485,7 +23485,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 211
m_SortingOrder: 2
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0

10
Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargeManager.lua
View File

@ -167,4 +167,14 @@ function this.IsShowFirstChatge()
return false
end
end
--
function this.GetAnimFlag(key)
local lt = PlayerPrefs.GetInt(PlayerManager.uid..key)
return Util_Check_insameday(lt, GetTimeStamp())
end
function this.SetAnimFlag(key)
PlayerPrefs.SetInt(PlayerManager.uid..key, GetTimeStamp())
end
return this

12
Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua
View File

@ -133,9 +133,13 @@ function FirstRechargePanel:OnOpen(context,_fun)
self.selectTabIndex = context.tabIndex and context.tabIndex or 1
-- self:SetOncePart()
fun = _fun
self.qianyao:SetActive(false)
self.qianyao:SetActive(true)
local qyTime = 0
if not FirstRechargeManager.GetAnimFlag("FirstRechargeAnim") then
self.qianyao:SetActive(true)
qyTime = 1.5
FirstRechargeManager.SetAnimFlag("FirstRechargeAnim")
end
self.frame:SetActive(false)
self.effect:SetActive(false)
self.ani.enabled = false
@ -145,11 +149,11 @@ function FirstRechargePanel:OnOpen(context,_fun)
self.frame:SetActive(true)
self.effect:SetActive(true)
self.ani.enabled = true
end, 1.5):Start()
end, qyTime):Start()
Timer.New(function ()
self.tabs[1]:SetActive(true)
self.closeBtn:GetComponent("Button").enabled = true
end, 2.5):Start()
end, qyTime + 1):Start()
end
function FirstRechargePanel:OnShow()