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

dev_chengFeng
jiaoyangna 2020-08-28 14:06:15 +08:00
commit bf09d96840
10 changed files with 43 additions and 18 deletions

View File

@ -53,7 +53,7 @@ namespace GameLogic
/// <summary>
/// 析构函数
/// </summary>
new void OnDestroy()
void OnDestroy()
{
Reset();
}

View File

@ -54966,7 +54966,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -101993,7 +101993,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -122258,12 +122258,12 @@ GameObject:
- component: {fileID: 8372953808703828970}
- component: {fileID: 4701517501157699323}
m_Layer: 5
m_Name: btn
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &876998903884338440
RectTransform:
m_ObjectHideFlags: 0
@ -122280,8 +122280,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: 4.3, y: 4.7}
m_SizeDelta: {x: 142, y: 141.8}
m_AnchoredPosition: {x: 45.3, y: 45.7}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8372953808703828970
CanvasRenderer:
@ -122304,14 +122304,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
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: 0}
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -122381,7 +122381,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -592,6 +592,7 @@ RedPointType = {
LegendExplore = 118, --车迟斗法副本
EndLess = 119,--无尽副本
Trial = 121,--森罗幻境
TrialReward = 1211,--森罗任务
-- 充值
Recharge = 120,

View File

@ -1411,7 +1411,7 @@ function this.TimeFormat()
local startTime = ArenaTopMatchManager.GetTopMatchTime()
local tempTime = startTime - PlayerManager.serverTime
-- 当日五点开始显示
if tempTime < 16 * 60 * 60 then
if tempTime > 0 and tempTime < 16 * 60 * 60 then
SetTopMatchActive(true)
this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime)
else

View File

@ -206,6 +206,20 @@ function this.GetTrialRewardState(id)
return 1
end
end
--任务红点检测
function this.TrialRewardRedPointCheck()
local d={}
for _, configInfo in ConfigPairs(trialKillConfig) do
table.insert(d, configInfo)
end
for i = 1, #d do
local state = MapTrialManager.GetTrialRewardState(d[i].Id)
if state == 1 then
return true
end
end
return false
end
--设置试练奖励信息
function this.SetTrialRewardInfo(v)
@ -222,6 +236,7 @@ end
--设置试练已杀小怪数量
function this.SetKillCount(v)
CheckRedPointStatus(RedPointType.TrialReward)
this.killCount=v
end
--获取已杀小怪数量

View File

@ -70,6 +70,9 @@ function TrialMapPanel:InitComponent(root, mapPanel)
--boss召唤特效
this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab")
this.energyRoot = Util.GetGameObject(root, "stepROot")
this.rewardRedPoint = Util.GetGameObject(root,"leftCenter/btnReward/redPoint")
BindRedPointObject(RedPointType.TrialReward, this.rewardRedPoint)
end
@ -461,6 +464,7 @@ function TrialMapPanel:OnClose()
end
function TrialMapPanel:OnDestroy()
ClearRedPointObject(RedPointType.TrialReward)
SubUIManager.Close(this.upView)
heroList={}
end

View File

@ -107,6 +107,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane)
RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)
RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
@ -245,7 +246,7 @@ function this.InitRedPointAllRelate()
-- 成就
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
--大闹天宫 天宫秘宝
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.Expedition)
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
end
-- 注册红点检测方法
@ -394,14 +395,15 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION)
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING)
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
--万象境副本
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck)
RPData:AddCheckFunc(RedPointType.TrialReward, MapTrialManager.TrialRewardRedPointCheck)
RPData:AddCheckFunc(RedPointType.EndLess, EndLessMapManager.EndlessRedCheck)
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)

View File

@ -108,6 +108,7 @@ function this.SetScrollPre(root,data)
mask:SetActive(true)
getBtn:SetActive(false)
this.RefreshPanel()
CheckRedPointStatus(RedPointType.TrialReward)
end)
end)
end)

View File

@ -90,6 +90,7 @@ function this:RemoveListener()
end
function this:OnShow(_parent,...)
oldChoosed = nil
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
@ -142,8 +143,9 @@ function this.RefreshPanel()
hpExp.value=v.heroHp/10000
Util.SetGray(o,v.heroHp<=0)
choosed:SetActive(i==1)
if i==1 then
choosed:SetActive(false)
if MapTrialManager.selectHeroDid == v.heroId then
choosed:SetActive(true)
oldChoosed=choosed
selectHeroDid=v.heroId
end

View File

@ -468,7 +468,7 @@ function this.NextCurEquipData()
end
--界面关闭时调用(用于子类重写)
function RoleEquipChangePopup:OnClose()
nextSuitProGo = {}
end
--界面销毁时调用(用于子类重写)