Merge remote-tracking branch 'origin/master_develop' into master_test_hw

dev_chengFeng
JieLing 2020-08-28 16:57:32 +08:00
commit 76f266785d
16 changed files with 154 additions and 88 deletions

View File

@ -1,43 +0,0 @@
fileFormatVersion: 2
guid: f2bee7ee73646ff4bbd38330ba811a03
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
1:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
4:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
7:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/skill/skill/audio_effect_c_dj_0008_attack_01
assetBundleVariant: unity3d

View File

@ -389,6 +389,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 224904321620959202}
- {fileID: 4713408717203589656}
- {fileID: 224334288354510334}
- {fileID: 224062354008043908}
- {fileID: 6080936867154570897}
@ -570,7 +571,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224385547185248858}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1004,7 +1005,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224385547185248858}
m_RootOrder: 2
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}
@ -1083,7 +1084,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224385547185248858}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1554,7 +1555,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
@ -1832,7 +1832,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224385547185248858}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2863,6 +2863,80 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 9999
--- !u!1 &1938612575595338776
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4713408717203589656}
- component: {fileID: 5642926479020257713}
- component: {fileID: 4135660056531057494}
m_Layer: 5
m_Name: proima
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4713408717203589656
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938612575595338776}
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: 224385547185248858}
m_RootOrder: 1
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: -344.5, y: 176}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5642926479020257713
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938612575595338776}
m_CullTransparentMesh: 0
--- !u!114 &4135660056531057494
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938612575595338776}
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: 77e481cf00a5dac40b7934a92d418667, 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 &5638074113501995734
GameObject:
m_ObjectHideFlags: 0
@ -2893,7 +2967,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224385547185248858}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -833,14 +833,14 @@ function this.CarbonRedCheck(redType)
-- return false
-- end
--车迟斗法
-- elseif redType == RedPointType.LegendExplore then
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
-- and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
-- or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
-- return true
-- else
-- return false
-- end
elseif redType == RedPointType.LegendExplore then
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
return true
else
return false
end
end
end

View File

@ -178,6 +178,21 @@ function CarbonTypePanelV2:BindEvent()
UIManager.OpenPanel(UIName.VipPanelV2)
end
)
for k,v in ipairs(carbons) do
local data
if not type[PlayerManager.carbonType][k] then
data = type[PlayerManager.carbonType].default
else
data = type[PlayerManager.carbonType][k]
end
if data.redPointType == -1 or not data.redPointType then
Util.GetGameObject(v, "redPoint"):SetActive(false)
else
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
end
end
end
--添加事件监听(用于子类重写)
@ -192,19 +207,7 @@ end
--副本类型 1 综合 2 万象
function CarbonTypePanelV2:OnOpen()
carbonType = PlayerManager.carbonType
for k,v in ipairs(carbons) do
local data
if not type[PlayerManager.carbonType][k] then
data = type[PlayerManager.carbonType].default
else
data = type[PlayerManager.carbonType][k]
end
if data.redPointType == -1 or not data.redPointType then
Util.GetGameObject(v, "redPoint"):SetActive(false)
else
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
end
end
if carbonType == 1 then
-- 清除一下选得副本类型
CarbonManager.difficulty = 0
@ -226,8 +229,7 @@ end
--界面打开时调用(用于子类重写)
function CarbonTypePanelV2:OnShow(...)
carbonType = PlayerManager.carbonType
LogBlue("carbonType2:"..carbonType)
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos
this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize
@ -475,6 +477,18 @@ function CarbonTypePanelV2:OnClose()
end
this.isPlayDoorAudio = false
carbonType = 0
end
--界面销毁时调用(用于子类重写)
function CarbonTypePanelV2:OnDestroy()
hasFresh = false
if this.BtView then
SubUIManager.Close(this.BtView)
end
carbons = {}
this.playerHead=nil
for k,v in ipairs(carbons) do
local data
if not type[PlayerManager.carbonType][k] then
@ -489,14 +503,4 @@ function CarbonTypePanelV2:OnClose()
end
end
--界面销毁时调用(用于子类重写)
function CarbonTypePanelV2:OnDestroy()
hasFresh = false
if this.BtView then
SubUIManager.Close(this.BtView)
end
carbons = {}
this.playerHead=nil
end
return CarbonTypePanelV2

View File

@ -85,6 +85,7 @@ function FormationEditPopup:BindEvent()
if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除
func(dids)
end
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)--设置森罗红点关
self:ClosePanel()
end)
else

View File

@ -88,7 +88,9 @@ function GuildCarDelayMainPanel:BindEvent()
return
end
if curProgress == 1 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_CAR_DELEAY)
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_CAR_DELEAY,function ()
CheckRedPointStatus(RedPointType.LegendExplore)
end)
end
end)
--抢夺
@ -107,7 +109,9 @@ function GuildCarDelayMainPanel:BindEvent()
return
end
if curProgress == 3 then
UIManager.OpenPanel(UIName.GuildCarDelayLootPopup)
UIManager.OpenPanel(UIName.GuildCarDelayLootPopup,function()
CheckRedPointStatus(RedPointType.LegendExplore)
end)
end
end)
--帮助按钮
@ -322,6 +326,7 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeNumText,timeD
if _timeTextExpertgo then
_timeTextExpertgo:SetActive(false)
end
this.RefrePanelRedPoint()
end
end
function this.TimeStampToDateString(second)
@ -389,6 +394,7 @@ function this.RemainTimeDown2(_timeTextExpertgo,timeNumText)
if _timeTextExpertgo then
_timeTextExpertgo:SetActive(false)
end
this.RefrePanelRedPoint()
end
end
function this.TimeStampToDateString2(second)
@ -412,7 +418,7 @@ end
function this.RefrePanelRedPoint()
Util.GetGameObject(this.challengeBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge))
Util.GetGameObject(this.lootBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot))
--CheckRedPointStatus(RedPointType.LegendExplore)
CheckRedPointStatus(RedPointType.LegendExplore)
Util.SetGray(Util.GetGameObject(this.challengeBtn,"redPoint"),false)
Util.SetGray(Util.GetGameObject(this.lootBtn,"redPoint"),false)
end

View File

@ -447,7 +447,7 @@ end
--红点检测
function this.EndlessRedCheck()
if this.GetLeftMapEnergy() == 100 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS)then
if this.GetLeftMapEnergy() >= 100 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS)then
return true
else
return false

View File

@ -154,7 +154,7 @@ function TrialMapPanel:OnOpen()
-- 检测引导
GuideManager.CheckCarbonGuild(CARBON_TYPE.TRIAL)
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)
-- PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)
end
function TrialMapPanel:OnShow()

View File

@ -180,7 +180,7 @@ function this.RefreshUpdateIndication(buffer)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
end

View File

@ -159,6 +159,7 @@ function this.PlayerInfoRequest(func)
QuestionnaireManager.SetQuestionState(msg.QuestionState)
PlayerManager.SetMaxEnergy()
PlayerManager.ResetLocalData()--初始化所有本地的每日一刷
PlayerManager.InitServerTime()
GuideManager.InitData(msg.newPlayerGuidePoint)
--临时初始化地图探索的静态数据

View File

@ -44,6 +44,29 @@ function this.InitServerTime()
UpdateBeat:Add(update, this)
end
function this.ResetLocalData()
local func = function ()
--三个抽奖勾选重置
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
end
local text =PlayerManager.uid.."fiveTime"
local curTime = GetTimeStamp()
if PlayerPrefs.HasKey(text) then
if PlayerPrefs.GetInt(text) > curTime then
func()
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400)
end
else
func()
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400)
end
end
function this.OnGoldChange()
end