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

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
dev_chengFeng
gaoxin 2020-09-01 14:38:29 +08:00
commit c6bdebeffb
26 changed files with 50521 additions and 49878 deletions

View File

@ -229,7 +229,7 @@ AudioMixerSnapshotController:
cbf53b279f195614d9b265d4e5842edf: -0.3976258
c9970e37bbf9e8d46a9afdc772aed464: 10.5
5d7f114794b28b642a8684d352483a3a: 0.13552582
2502d957993f9ce46abe4c5fbea6006b: 0.07
2502d957993f9ce46abe4c5fbea6006b: 0.058
b85bfb5713fd0564ea82324f4afa73ed: 10
813b2c57cb1c0b242a5e3475a5e78ac1: 4889
5a2cbe67c424dae489be0ba1badf5e35: 0.142
@ -250,7 +250,7 @@ AudioMixerSnapshotController:
8241ee78bdb8e484ca433db06fbb7716: 10
9a27e388e9875a64b8add0d2b36b37d7: -159
6c9988888fd272d4d931b61db779eceb: 15000
338e0a88659e1a341a9339a11c4ffc76: 596
338e0a88659e1a341a9339a11c4ffc76: -654
adc817a8aab7d1442afcf14905eb193f: 10
38479ea820aa45a4da2928b175eca672: -60
5888eab8363fe914d8f85413f27db2b4: 10
@ -360,7 +360,7 @@ AudioMixerSnapshotController:
075b04deeb57c5240881f915afda4dad: 7.7
73ffc90f389903b4baa63469b529465e: 0.942
3ab1be1f86666554ba507f6d6bb81409: 11.5
6846a02ff7862cd4d88bf0a222b0298f: 0
6846a02ff7862cd4d88bf0a222b0298f: -2500
85a7f35fa38ca2b459a9dd053396ce75: 1.7
5492f77f044cdad48b9ffc32c7041212: 3.43
308c2d7fffca55948a61c7445c76e65a: 13088

View File

@ -1403,6 +1403,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8884866863684052163}
- {fileID: 4761152530414516612}
m_Father: {fileID: 2074615673247246092}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2267,7 +2268,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030474932, y: -0.00006866455}
m_AnchoredPosition: {x: 0.00000022109849, y: -0.00006866455}
m_SizeDelta: {x: 0, y: -0.000091553}
m_Pivot: {x: 0.00000010803342, y: 0.9999999}
--- !u!114 &1627984918352808191
@ -3128,6 +3129,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7473658514688411998
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4761152530414516612}
- component: {fileID: 7604321490140284684}
- component: {fileID: 4863689936893988552}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4761152530414516612
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7473658514688411998}
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: 3326536973926357875}
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: 109.9, y: 29.8}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7604321490140284684
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7473658514688411998}
m_CullTransparentMesh: 0
--- !u!114 &4863689936893988552
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7473658514688411998}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7649339650806897321
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -3466,6 +3466,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1854288102
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1854288103}
- component: {fileID: 1854288105}
- component: {fileID: 1854288104}
m_Layer: 5
m_Name: FourStarUpTip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1854288103
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1854288102}
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: 99061827347249233}
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}
m_AnchoredPosition: {x: 0, y: -181}
m_SizeDelta: {x: 896.2, y: 103.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1854288105
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1854288102}
m_CullTransparentMesh: 0
--- !u!114 &1854288104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1854288102}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5305\u542B4\u661F\u6216\u66F4\u9AD8\u661F\u7EA7\u7684\u795E\u5C06"
--- !u!1 &2094983473
GameObject:
m_ObjectHideFlags: 0
@ -4081,6 +4160,7 @@ RectTransform:
- {fileID: 842539747175188767}
- {fileID: 4223901690703525666}
- {fileID: 2653261043892842644}
- {fileID: 1854288103}
m_Father: {fileID: 2925180131101153177}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5421,7 +5501,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 2.82}
m_AnchoredPosition: {x: 0, y: 2.8199997}
m_SizeDelta: {x: 136.3, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &669081978522593080
@ -8490,7 +8570,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 96.890015, y: 292.40002}
m_AnchoredPosition: {x: 96.89014, y: 292.4004}
m_SizeDelta: {x: 31, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7033078376770540937
@ -8861,7 +8941,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -97.23004, y: 292.40002}
m_AnchoredPosition: {x: -97.22998, y: 292.4004}
m_SizeDelta: {x: 31, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3299381173825919033

View File

@ -5026,6 +5026,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2957508552189419856}
- {fileID: 4819307186158778318}
m_Father: {fileID: 7371073405952275444}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -69456,6 +69457,80 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &6946665725568300109
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4819307186158778318}
- component: {fileID: 4818197730813192708}
- component: {fileID: 2624448798057393218}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4819307186158778318
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6946665725568300109}
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: 300744666340969162}
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: 88.2, y: 17.5}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4818197730813192708
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6946665725568300109}
m_CullTransparentMesh: 0
--- !u!114 &2624448798057393218
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6946665725568300109}
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: 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: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7300991108107053034
GameObject:
m_ObjectHideFlags: 0
@ -74652,7 +74727,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000006416253}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8134860863072840228

View File

@ -591,6 +591,7 @@ RedPointType = {
EpicExplore = 117, --心魔副本
LegendExplore = 118, --车迟斗法副本
EndLess = 119,--无尽副本
EndlessPanel = 1191,--无尽副本界面红点
Trial = 121,--森罗幻境
TrialReward = 1211,--森罗任务
-- 充值

View File

@ -1879,7 +1879,7 @@
[11878] = "升星被动技能id ",
[11879] = "新增技能",
[11880] = "道具不足!",
[11881] = "赠送1个元神玉和20个置换玉",
[11881] = "赠送1个元神玉",
[11882] = "赠送1个妖灵玉",
[11883] = "活动结束!",
[11884] = "赠送10个元神玉",
@ -2387,4 +2387,6 @@
[12386] = "极速排名",
[12387] = "军团副本",
[12388] = "该神将在巅峰战阵容中已上阵",
[12389] = "包含4星或更高星级的神将",
[12390] = "挑战关卡快速升级",
}

View File

@ -37,6 +37,8 @@ GameEvent = {
-- 玩家头像框改变
OnHeadFrameChange = "Player.OnHeadFrameChange",
OnHeadChange = "Player.OnHeadChange",
--打关卡升级小提示
OnShowBattleUpLvTip = "Player.OnShowBattleUpLvTip",
},
Treasure={
--宝物强化/精炼提升

View File

@ -828,6 +828,17 @@ function this. CarbonRedCheck(redType)
-- end
--大闹天宫
elseif redType == RedPointType.OrdinaryExplore then
--两天一重置的红点
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION)
local text =PlayerManager.uid.."ExpeditionRed"
-- PlayerPrefs.DeleteKey(text)
if not PlayerPrefs.HasKey(text) then
PlayerPrefs.SetInt(text,0)
end
if PlayerPrefs.GetInt(text,serData.endTime) ~= serData.endTime then
return true
end
--奖励红点
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
return TreasureOfHeavenManger.RedPoint()
end

View File

@ -352,6 +352,8 @@ function this.BtnClick(id)
JumpManager.GoJump(64001)
end
NetManager.TreasureOfHeavenScoreRequest()
PlayerPrefs.SetInt(PlayerManager.uid.."ExpeditionRed",ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION).endTime)
CheckRedPointStatus(RedPointType.OrdinaryExplore)
else
if ExpeditionManager.ExpeditionState == 2 then
PopupTipPanel.ShowTip(Language[12195])

View File

@ -39,6 +39,9 @@ function EndLessCarbonPanel:InitComponent()
this.bgTime = Util.GetGameObject(self.gameObject, "stepRoot/bg/Bgtime")
this.actCountTime = Util.GetGameObject(this.bgTime, "time"):GetComponent("Text")
--红点
this.redPoint = Util.GetGameObject(self.gameObject, "Bg/bg1/InfoRoot/btnFight/redPoint")
this.rewardList = {}
this.bossList = {}
@ -82,6 +85,8 @@ function EndLessCarbonPanel:BindEvent()
Util.AddClick(this.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.EndLessMap, this.helpPosition.x, this.helpPosition.y)
end)
BindRedPointObject(RedPointType.EndlessPanel,this.redPoint)
end
--添加事件监听(用于子类重写)
@ -247,6 +252,7 @@ end
--界面销毁时调用(用于子类重写)
function EndLessCarbonPanel:OnDestroy()
ClearRedPointObject(RedPointType.EndlessPanel,this.redPoint)
this.rewardList = {}
this.bossList = {}
end

View File

@ -223,6 +223,8 @@ function FightPointPassMainPanel:InitComponent()
this.OpenSeverWelfareTimeText = Util.GetGameObject(this.OpenSeverWelfare, "time"):GetComponent("Text")
this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text")
this.OpenSeverWelfareRed = Util.GetGameObject(this.OpenSeverWelfare, "redpot")
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[12390]
end
@ -334,6 +336,7 @@ function FightPointPassMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--移除事件监听(用于子类重写)
@ -346,6 +349,7 @@ function FightPointPassMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--界面打开时调用(用于子类重写)
@ -418,6 +422,9 @@ function FightPointPassMainPanel:OnShow()
this.openFun:SetActive(false)
end --开服福利显示
this.UpdateOpenSeverWelfare()
PlayerManager.StarBattleUpLvTipTime(2)
this.battleUpLvTip:SetActive(false)
end
--寻宝显示
function this.UpdateFindTreasureMaterialNum()
@ -626,7 +633,7 @@ end
--界面关闭时调用(用于子类重写)
function FightPointPassMainPanel:OnClose()
PlayerManager.StopBattleUpLvTipTime()
hasLoad = false
invadeMonster:OnClose()
fightMap:Dispose()
@ -885,5 +892,8 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
end
end
end
function this.RefreshBattleUpLvTip()
this.battleUpLvTip:SetActive(true)
end
--开服福利显示 结束
return FightPointPassMainPanel

View File

@ -411,6 +411,8 @@ function this:InitComponent()
this.btnDynamicActivity = Util.GetGameObject(self.gameObject, "RightUp/dynamicActivity")
this.DynamicActivityRedPoint = Util.GetGameObject(this.btnDynamicActivity, "redPoint")
this.DynamicActivityTime = Util.GetGameObject(this.btnDynamicActivity, "time"):GetComponent("Text")--
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[12390]
end
function this:SetPosFunc(v2)
@ -954,6 +956,7 @@ function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
--移除事件监听(用于子类重写)
@ -972,6 +975,7 @@ function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
end
@ -1092,6 +1096,8 @@ function this:OnShow()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
PlayerManager.IsGetFiveStarHero = false
end
PlayerManager.StarBattleUpLvTipTime(1)
this.battleUpLvTip:SetActive(false)
end
@ -1481,6 +1487,8 @@ end
--界面关闭时调用(用于子类重写)
function this:OnClose()
-- 关闭定时刷新数据
PlayerManager.StopBattleUpLvTipTime()
this.ChatTipView:StopCheck()
PatFaceManager.isLogin = false
--if patFaceCallList then
@ -1753,7 +1761,9 @@ end
this.sgItemView:OnOpen(false,{itemId,0},0.73)
this.sgName.text=ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name
end
function this.RefreshBattleUpLvTip()
this.battleUpLvTip:SetActive(true)
end
-- 刷新公会战图标显示
-- function this.RefreshGuildFightShow()
-- local isActive = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD)

View File

@ -632,8 +632,8 @@ function this.TrialChangeFloor(msg)
-- end
SwitchPanel.OpenPanel(UIName.MapPanel)
MapTrialManager.isChangeLevel = false
Log("换层前的层数:"..MapTrialManager.curTowerLevel)
Log("要换到的层数:"..msg.curTower)
-- Log("换层前的层数:"..MapTrialManager.curTowerLevel)
-- Log("要换到的层数:"..msg.curTower)
-- if MapTrialManager.curTowerLevel<10000 then
-- MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
-- end

View File

@ -204,42 +204,42 @@ function this.SetSelectHero()
--刷新英雄选择面板时 检测血量 若有低于40%血量的英雄 给选择Hero加血
--再遍历一次防止下面的return 打断上面for循环表现的正常赋值
--这里只关于自动嗑药逻辑
for k, v in ipairs(d) do
--若存在该设置参数并为已勾选状态 =1 否则=0
local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)
and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)==1) and 1 or 0
if t==0 then return end
if MapTrialManager.selectHeroDid== v.heroId then
if v.heroHp<=0 then
PopupTipPanel.ShowTip(string.format(Language[11262],itemConfig[itemId].Name))
return
end
end
--若血量小于自动回复百分比 并且 有血量
if v.heroHp/10000<trialSetting[1].HealingPercent/10000 and v.heroHp>0 then
if (itemNum-MapManager.addHpCount)<=0 then
PopupTipPanel.ShowTip(string.format(Language[11263],itemConfig[itemId].Name))
return
end
if BagManager.GetItemCountById(itemId)<=0 then
PopupTipPanel.ShowTip(string.format(Language[11264],itemConfig[itemId].Name,itemConfig[itemId].Name))
return
end
NetManager.UseAddHpItemRequest(MapTrialManager.selectHeroDid,function()
local curHeroHp=0
if v.heroId==MapTrialManager.selectHeroDid then
curHeroHp=v.heroHp
end
curHeroHp=curHeroHp+5000 --5000增加的血量也是要配表的
if curHeroHp>=10000 then
curHeroHp=10000
end
MapTrialManager.SetHeroHp({curHeroHp},MapTrialManager.selectHeroDid,function()
PopupTipPanel.ShowTip(string.format(Language[11265],itemConfig[itemId].Name))
end)
end)
end
end
-- for k, v in ipairs(d) do
-- --若存在该设置参数并为已勾选状态 =1 否则=0
-- local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)
-- and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)==1) and 1 or 0
-- if t==0 then return end
-- if MapTrialManager.selectHeroDid== v.heroId then
-- if v.heroHp<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11262],itemConfig[itemId].Name))
-- return
-- end
-- end
-- --若血量小于自动回复百分比 并且 有血量
-- if v.heroHp/10000<trialSetting[1].HealingPercent/10000 and v.heroHp>0 then
-- if (itemNum-MapManager.addHpCount)<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11263],itemConfig[itemId].Name))
-- return
-- end
-- if BagManager.GetItemCountById(itemId)<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11264],itemConfig[itemId].Name,itemConfig[itemId].Name))
-- return
-- end
-- NetManager.UseAddHpItemRequest(MapTrialManager.selectHeroDid,function()
-- local curHeroHp=0
-- if v.heroId==MapTrialManager.selectHeroDid then
-- curHeroHp=v.heroHp
-- end
-- curHeroHp=curHeroHp+5000 --5000增加的血量也是要配表的
-- if curHeroHp>=10000 then
-- curHeroHp=10000
-- end
-- MapTrialManager.SetHeroHp({curHeroHp},MapTrialManager.selectHeroDid,function()
-- PopupTipPanel.ShowTip(string.format(Language[11265],itemConfig[itemId].Name))
-- end)
-- end)
-- end
-- end
end

View File

@ -576,13 +576,13 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
end
end
--若血量小于自动回复百分比 并且 有血量
if v.heroHp/10000<trialSetting[1].HealingPercent/10000 and v.heroHp>0 then
if v.heroHp/10000<trialSetting[1].HealingPercent/10000 and v.heroHp>0 and v.heroId == MapTrialManager.selectHeroDid then
if (itemNum-MapManager.addHpCount)<=0 then
PopupTipPanel.ShowTip(string.format(Language[11263],itemConfig[itemId].Name))
-- PopupTipPanel.ShowTip(string.format(Language[11263],itemConfig[itemId].Name))
return
end
if BagManager.GetItemCountById(itemId)<=0 then
PopupTipPanel.ShowTip(string.format(Language[11264],itemConfig[itemId].Name,itemConfig[itemId].Name))
-- PopupTipPanel.ShowTip(string.format(Language[11264],itemConfig[itemId].Name,itemConfig[itemId].Name))
return
end
NetManager.UseAddHpItemRequest(MapTrialManager.selectHeroDid,function()

View File

@ -384,4 +384,64 @@ function this.GetHeroDataByStar(star,staticid)
return false
end
--主城停留弹气泡
local level_bubble_config = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig,88).Value,"|")
local battleUpLvTipTime = Timer.New()
local curMianPanleLoginShowTipNum = 0
local curLevelPanleLoginShowTipNum = 0
local noShowBattleUpLvTipMaxLv = tonumber(level_bubble_config[3])
local noShowBattleUpLvTipMaxNum = tonumber(level_bubble_config[2])
local showBattleUpLvTipMaxTime = tonumber(level_bubble_config[1])
function this.StarBattleUpLvTipTime(type)
local curSecound = 0
if PlayerManager.level >= noShowBattleUpLvTipMaxLv then
return
end
if not FightPointPassManager.IsShowFightRP() then
return
end
if GuideManager.IsInMainGuide() then
return
end
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
if type == 1 and curMianPanleLoginShowTipNum < noShowBattleUpLvTipMaxNum then--主界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("主界面停留 "..curSecound)
if curSecound >= showBattleUpLvTipMaxTime then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnShowBattleUpLvTip)
curMianPanleLoginShowTipNum = curMianPanleLoginShowTipNum + 1
end
end, 1, -1, true)
battleUpLvTipTime:Start()
elseif type == 2 and curLevelPanleLoginShowTipNum < noShowBattleUpLvTipMaxNum then--关卡界面
battleUpLvTipTime = Timer.New(function()
curSecound = curSecound + 1
-- LogGreen("关卡界面停留 "..curSecound)
if curSecound >= showBattleUpLvTipMaxTime then
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnShowBattleUpLvTip)
curLevelPanleLoginShowTipNum = curLevelPanleLoginShowTipNum + 1
end
end, 1, -1, true)
battleUpLvTipTime:Start()
end
end
function this.StopBattleUpLvTipTime()
if battleUpLvTipTime then
battleUpLvTipTime:Stop()
battleUpLvTipTime = nil
end
end
return this

View File

@ -109,6 +109,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)
-- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
RPData:SetParent(RedPointType.EndlessPanel, RedPointType.EndLess)
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
-- 充值
@ -405,7 +406,7 @@ function this.RegisterRedCheckFunc()
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.EndlessPanel, EndLessMapManager.EndlessRedCheck)
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot)

View File

@ -19,6 +19,8 @@ function this:InitComponent(gameObject)
this.bodyText=Util.GetGameObject(gameObject,"BodyText"):GetComponent("Text")
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
this.FourStarUpTip=Util.GetGameObject(gameObject,"FourStarUpTip")
Util.GetGameObject(gameObject,"FourStarUpTip"):GetComponent("Text").text = Language[12389]
--滚动条根节点
this.root = Util.GetGameObject(gameObject, "Root")
@ -56,7 +58,13 @@ function this:OnShow(_parent,...)
local args = {...}
dropList = args[1]
selectHeroData=args[2]
local isShowFourStarUpTip = false
for k,v in pairs(selectHeroData) do
if v.star >= 4 then
isShowFourStarUpTip = true
end
end
this.FourStarUpTip:SetActive(isShowFourStarUpTip)
this.titleText.text=Language[11643]
--返还比
local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100

View File

@ -193,7 +193,7 @@ function this.QuickSelectListData(type)
if type == 1 then
selectHeroData={}
for k, v in pairs(tarHero) do
if LengthOfTable(selectHeroData)<maxSelectNum and (v.isFormation == "" or (v.isFormation ~= "" and v.isFormations[1] == FormationTypeDef.EXPEDITION)) and v.lockState == 0 then
if LengthOfTable(selectHeroData)<maxSelectNum and (v.isFormation == "" or (v.isFormation ~= "" and v.isFormations[1] == FormationTypeDef.EXPEDITION)) and v.lockState == 0 and v.star < 4 then
selectHeroData[v.dynamicId]=v
else
break

View File

@ -198,13 +198,14 @@ function this.OnShowSingleEquipTreasure(go,equipTreasureDid)
Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.refineLv/nextJewelResonanceConfig.Level
else
if curEquipTreasureData.refineLv>=curEquipTreasureData.maxRefineLv then
Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = Language[11802]
Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11089]
else
Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11804]
Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.refineLv.."/"..curJewelResonanceConfig.Level
Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.refineLv/curJewelResonanceConfig.Level
end
Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = Language[11802]
Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11089]
Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = 1
else
Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11804]
Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.refineLv.."/"..curJewelResonanceConfig.Level
Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.refineLv/curJewelResonanceConfig.Level
end
end
--点击精炼按钮
Util.AddOnceClick(Util.GetGameObject(go.transform,"btn"), function()

View File

@ -19,13 +19,14 @@ local curLv=0 --当前法宝等级
local orginLayer
--属性容器
local proList = {}
local teamHero = {}
function RoleTalismanPanelV2:InitComponent()
orginLayer =0
this.effect = Util.GetGameObject(this.gameObject,"Effect")--背景特效
this.backBtn= Util.GetGameObject(this.gameObject, "BackBtn/Btn")
this.advanceBtn=Util.GetGameObject(this.gameObject,"AdvanceBtn")--进阶按钮
this.advanceBtnRedPot=Util.GetGameObject(this.gameObject,"AdvanceBtn/redPoint")
this.leftBtn = Util.GetGameObject(this.gameObject, "LeftBtn")
this.rightBtn = Util.GetGameObject(this.gameObject, "RightBtn")
this.helpBtn= Util.GetGameObject(this.transform, "HelpBtn")
@ -111,6 +112,7 @@ function RoleTalismanPanelV2:OnOpen(_curHeroData,_heroListData)
end
end
end
teamHero = FormationManager.GetAllFormationHeroId()
end
function RoleTalismanPanelV2:OnShow()
@ -122,7 +124,6 @@ function RoleTalismanPanelV2:OnShow()
--已激活法宝的Hero为1时 隐藏左右按钮
this.leftBtn.gameObject:SetActive(#heroListData>1)
this.rightBtn.gameObject:SetActive(#heroListData>1)
this.OnShowHeroAndTalisman()
end
function RoleTalismanPanelV2:OnClose()
@ -147,6 +148,7 @@ end
--刷新界面
function this.OnShowHeroAndTalisman()
this.advanceBtnRedPot:SetActive(teamHero[curHeroData.dynamicId] and HeroManager.GetIsShowTalismanRedPoint(curHeroData))
this.content:DOAnchorPosY(0, 0)
local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroData.id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID
--获取法宝最大等级