小兵显示修改提交
parent
e7407fdc68
commit
84be275ca1
|
|
@ -21142,8 +21142,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: -26.999985}
|
m_AnchoredPosition: {x: -5.58, y: -36.89}
|
||||||
m_SizeDelta: {x: 362, y: 114}
|
m_SizeDelta: {x: 388.63, y: 143.75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2039730616
|
--- !u!222 &2039730616
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -41286,7 +41286,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -30.74}
|
m_AnchoredPosition: {x: 50, y: -30.74}
|
||||||
m_SizeDelta: {x: 100, y: 61.48}
|
m_SizeDelta: {x: 100, y: 61.48}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &7481411220995830971
|
--- !u!114 &7481411220995830971
|
||||||
|
|
@ -56022,7 +56022,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -403, y: -937}
|
m_AnchoredPosition: {x: -444, y: -937}
|
||||||
m_SizeDelta: {x: 183.07, y: 34.09}
|
m_SizeDelta: {x: 183.07, y: 34.09}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6762569256055711093
|
--- !u!222 &6762569256055711093
|
||||||
|
|
@ -147374,7 +147374,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &3810595199443230696
|
--- !u!224 &3810595199443230696
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -154116,10 +154116,10 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u6311\u6218\u5173\u5361"
|
m_Text: "\u6311\u6218Boss"
|
||||||
LanguageIndex: 10528
|
LanguageIndex: 10528
|
||||||
--- !u!1 &8102363567124659666
|
--- !u!1 &8102363567124659666
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -154256,7 +154256,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &942618210107869783
|
--- !u!224 &942618210107869783
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -395,7 +395,7 @@ function FightPointPassMainPanel:BindEvent()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--BindRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
|
--BindRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
|
||||||
BindRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
|
--BindRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
|
||||||
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
|
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
|
||||||
BindRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
|
BindRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
|
||||||
BindRedPointObject(RedPointType.numberGame, this.numberGameRed)
|
BindRedPointObject(RedPointType.numberGame, this.numberGameRed)
|
||||||
|
|
@ -410,23 +410,45 @@ local levelList={}
|
||||||
--刷新boss信息显示
|
--刷新boss信息显示
|
||||||
function this.RefreshBossInfo()
|
function this.RefreshBossInfo()
|
||||||
levelList={}
|
levelList={}
|
||||||
|
local nextBossLv=0
|
||||||
local curFight=FightPointPassManager.curOpenFight
|
local curFight=FightPointPassManager.curOpenFight
|
||||||
|
local name=""
|
||||||
LogError("刷星boss显示 curfight==========================================================="..curFight)
|
LogError("刷星boss显示 curfight==========================================================="..curFight)
|
||||||
for k,v in ConfigPairs(fightLevelConfig) do
|
for k,v in ConfigPairs(fightLevelConfig) do
|
||||||
if k>=curFight then
|
if k>=curFight then
|
||||||
if v.OpenRule and (v.OpenRule[1][1]==9 or v.OpenRule[1][1]==0 )and FightPointPassManager.soldierLayerId>=v.OpenRule[1][2] then
|
if v.OpenRule and (v.OpenRule[1][1]==9 or v.OpenRule[1][1]==0 )and FightPointPassManager.soldierLayerId>=v.OpenRule[1][2] then
|
||||||
LogError("k==================================="..k)
|
LogError("k==================================="..k)
|
||||||
|
if name=="" then
|
||||||
|
name=v.Name
|
||||||
|
end
|
||||||
table.insert(levelList,k)
|
table.insert(levelList,k)
|
||||||
|
else
|
||||||
|
nextBossLv=v.OpenRule[1][2]
|
||||||
|
name=v.Name
|
||||||
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
LogError("nextBossLv====================="..nextBossLv)
|
||||||
if #levelList>0 then
|
if #levelList>0 then
|
||||||
this.bossObj:SetActive(true)
|
this.bossObj:SetActive(true)
|
||||||
this.bossNum.text=#levelList
|
this.bossNum.text=#levelList
|
||||||
|
this.fightLock:SetActive(false)
|
||||||
|
this.fightSaoGuang:SetActive(true)
|
||||||
|
this.fightGuideEffect:SetActive(true)
|
||||||
|
this.fightRP:SetActive(true)
|
||||||
else
|
else
|
||||||
this.bossObj:SetActive(false)
|
this.bossObj:SetActive(false)
|
||||||
|
this.fightLock:SetActive(true)
|
||||||
|
this.fightRP:SetActive(false)
|
||||||
|
this.fightSaoGuang:SetActive(false)
|
||||||
|
this.fightGuideEffect:SetActive(false)
|
||||||
|
this.lockText.text=string.format("%s层后开启",nextBossLv- FightPointPassManager.soldierLayerId)
|
||||||
end
|
end
|
||||||
|
this.openFun:SetActive(true)
|
||||||
|
this.openFunNeedInfo.text=name
|
||||||
|
this.fightText.text = "挑战Boss"
|
||||||
|
|
||||||
end
|
end
|
||||||
--刷新小兵信息
|
--刷新小兵信息
|
||||||
function this.RefreshSoliderInfo()
|
function this.RefreshSoliderInfo()
|
||||||
|
|
@ -464,7 +486,8 @@ function this.RefreshSoliderInfo()
|
||||||
this.soliderList[i].icon.gameObject:SetActive(false)
|
this.soliderList[i].icon.gameObject:SetActive(false)
|
||||||
this.soliderList[i].lv.gameObject:SetActive(false)
|
this.soliderList[i].lv.gameObject:SetActive(false)
|
||||||
this.soliderList[i].type.gameObject:SetActive(true)
|
this.soliderList[i].type.gameObject:SetActive(true)
|
||||||
this.soliderList[i].type.text="小兵"
|
local config=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SoldiersSetting,"Position",i,"Library",1)
|
||||||
|
this.soliderList[i].type.text=config.Name
|
||||||
--this.soliderList[i].lock:SetActive(true)
|
--this.soliderList[i].lock:SetActive(true)
|
||||||
end
|
end
|
||||||
--
|
--
|
||||||
|
|
@ -745,7 +768,7 @@ function FightPointPassMainPanel:AddListener()
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
|
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
--Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
||||||
|
|
@ -767,7 +790,7 @@ function FightPointPassMainPanel:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
|
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
--Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
||||||
|
|
@ -864,7 +887,7 @@ function FightPointPassMainPanel:OnShow()
|
||||||
-- 奖励预览
|
-- 奖励预览
|
||||||
this.IntiReward()
|
this.IntiReward()
|
||||||
-- 刷新关卡按钮状态
|
-- 刷新关卡按钮状态
|
||||||
this.SetFightBtnText()
|
--this.SetFightBtnText()
|
||||||
|
|
||||||
|
|
||||||
if not hasLoad then
|
if not hasLoad then
|
||||||
|
|
@ -895,14 +918,14 @@ function FightPointPassMainPanel:OnShow()
|
||||||
--寻宝显示
|
--寻宝显示
|
||||||
this.UpdateFindTreasureMaterialNum()
|
this.UpdateFindTreasureMaterialNum()
|
||||||
this.worldLv.text = PlayerManager.worldLeve
|
this.worldLv.text = PlayerManager.worldLeve
|
||||||
local openFunConFig = this.GetNextFightOpenFun()
|
-- local openFunConFig = this.GetNextFightOpenFun()
|
||||||
if openFunConFig then
|
-- if openFunConFig then
|
||||||
this.openFun:SetActive(true)
|
-- this.openFun:SetActive(true)
|
||||||
this.openFunNeedInfo.text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,openFunConFig.OpenRules[2]).Name
|
-- this.openFunNeedInfo.text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,openFunConFig.OpenRules[2]).Name
|
||||||
this.openFunFunInfo.text = Language[12163]..openFunConFig.Name
|
-- this.openFunFunInfo.text = Language[12163]..openFunConFig.Name
|
||||||
else
|
-- else
|
||||||
this.openFun:SetActive(false)
|
-- this.openFun:SetActive(false)
|
||||||
end --开服福利显示
|
-- end --开服福利显示
|
||||||
this.UpdateOpenSeverWelfare()
|
this.UpdateOpenSeverWelfare()
|
||||||
|
|
||||||
PlayerManager.StarBattleUpLvTipTime(2)
|
PlayerManager.StarBattleUpLvTipTime(2)
|
||||||
|
|
@ -1145,6 +1168,8 @@ function this.SetFightBtnText()
|
||||||
this.fightText.text = FightPointPassManager.GetBtnText()
|
this.fightText.text = FightPointPassManager.GetBtnText()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
--this.fightText.text="挑战Boss"
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 执行关卡战斗
|
-- 执行关卡战斗
|
||||||
|
|
@ -1316,7 +1341,7 @@ function FightPointPassMainPanel:OnDestroy()
|
||||||
SubUIManager.Close(this.UpView)
|
SubUIManager.Close(this.UpView)
|
||||||
SubUIManager.Close(this.BtView)
|
SubUIManager.Close(this.BtView)
|
||||||
--ClearRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
|
--ClearRedPointObject(RedPointType.DailyTaskMain, this.dailyRedPoint)
|
||||||
ClearRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
|
--ClearRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
|
||||||
ClearRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
|
ClearRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
|
||||||
ClearRedPointObject(RedPointType.numberGame,this.numberGameBtn)
|
ClearRedPointObject(RedPointType.numberGame,this.numberGameBtn)
|
||||||
ClearRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
|
ClearRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
|
||||||
|
|
|
||||||
|
|
@ -259,7 +259,7 @@ Func_Prop_Filter = {
|
||||||
[Func_Prop_Type.WeaponFetter] = function(funcData, heroData)
|
[Func_Prop_Type.WeaponFetter] = function(funcData, heroData)
|
||||||
return funcData
|
return funcData
|
||||||
end,
|
end,
|
||||||
--神兵羁绊属性加成
|
--挂机小兵属性加成
|
||||||
[Func_Prop_Type.Solider] = function(funcData, heroData)
|
[Func_Prop_Type.Solider] = function(funcData, heroData)
|
||||||
--LogError("heroData.dId======================================="..heroData.dId)
|
--LogError("heroData.dId======================================="..heroData.dId)
|
||||||
if funcData[heroData.dId] then
|
if funcData[heroData.dId] then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue