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

dev_chengFeng
jiaoyangna 2022-03-03 16:25:23 +08:00
commit a6cc38d08b
4 changed files with 239 additions and 0 deletions

View File

@ -2765,6 +2765,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4082977241631064924}
- {fileID: 2966450735027093444}
m_Father: {fileID: 3296866975889872376}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3126,6 +3127,81 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &1849353415569187340
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2966450735027093444}
- component: {fileID: 5212694263828666004}
- component: {fileID: 6986443435814524111}
m_Layer: 5
m_Name: Time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2966450735027093444
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1849353415569187340}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6943551164222808534}
m_Father: {fileID: 2030871928}
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: -42.5, y: 10.4}
m_SizeDelta: {x: 34, y: 230}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5212694263828666004
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1849353415569187340}
m_CullTransparentMesh: 0
--- !u!114 &6986443435814524111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1849353415569187340}
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: a1afca59c22dd134aa82c825eba5a0b8, 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 &3144043938213128025
GameObject:
m_ObjectHideFlags: 0
@ -6368,6 +6444,85 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8258995645814451705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6943551164222808534}
- component: {fileID: 6019055878222626690}
- component: {fileID: 6046079111508998608}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6943551164222808534
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8258995645814451705}
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: 2966450735027093444}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6019055878222626690
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8258995645814451705}
m_CullTransparentMesh: 0
--- !u!114 &6046079111508998608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8258995645814451705}
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: 0.95686275, g: 0.9254902, b: 0.7647059, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "20\u79D2\u540E\u53EF\u6311\u6218"
--- !u!1 &8920274028045604788
GameObject:
m_ObjectHideFlags: 0

View File

@ -1727,6 +1727,18 @@ function TimeToMS(t)
return string.format("%02d:%02d", _min, _sec)
end
--- 将一段时间转换为分或秒
function TimeToMorS(t)
if not t or t < 0 then
return "0"
elseif t > 0 and t < 60 then
return math.floor(t)..""
else
local _min = math.floor(t / 60)
return string.format("%02d分", _min)
end
end
--- 获取今天某时间点时间戳
function Today_N_OClockTimeStamp(n)
local currentTime = math.floor(GetTimeStamp())

View File

@ -10965,6 +10965,40 @@ local passivityList = {
BattleLogic.Event:AddEvent(BattleEventName.PassiveTreatingFactor,onPassiveTreatFactor,nil,nil,role)
end,
-- 主动攻击目标时,额外对目标造成[a]属性[b]%/目标最大数量的伤害
-- a[int]b[float]
[427] = function(role, args,id,judge)
local pro = args[1]
local v1 = args[2]
local onHit = function(target, damage, bCrit, finalDmg,damageType,skill)
--只对技能的直接目标生效,分摊出去的不会回血 2020/12/17 王振兴
if not skill then
return
end
--如果是boss 并且额外伤害是根据最大生命则返回
local isBoss=BattleUtil.CheckIsBoss(target)
if isBoss and pro==12 then
return
end
local val = floor( BattleUtil.FP_Mul(v1, target:GetRoleData(BattlePropList[pro]))/skill:GetMaxTargetNum())
BattleUtil.FinalDamageCountShield(nil,role, target, val)
end
local onSkillCast = function(skill)
if skill and not skill.isTriggerJudge and judge==1 then
return
end
role.Event:AddEvent(BattleEventName.RoleHit, onHit,nil,nil,role)
end
-- 技能后后
local onSkillCastEnd = function(skill)
if skill and not skill.isTriggerJudge and judge==1 then
return
end
role.Event:RemoveEvent(BattleEventName.RoleHit, onHit)
end
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role)
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role)
end,
}

View File

@ -121,6 +121,9 @@ function GuildMainCityPanel:InitComponent()
this.btnRedPacket=Util.GetGameObject(this.rightBox,"redPacket")
this.btnRedPacketRedPoint=Util.GetGameObject(this.btnRedPacket,"redPoint")
this.timeCount = Util.GetGameObject(self.transform,"Bg/btnCarDelay/Time")
this.timeText = Util.GetGameObject(this.timeCount,"Text"):GetComponent("Text")
if not this.playerInfoView then
this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform)
end
@ -407,6 +410,41 @@ end
-- 计时显示
local _BGMFlag = nil
function this._TimeUpdate()
--车迟斗法倒计时显示
local timeDown = -1
if GuildCarDelayManager.progress == GuildCarDelayProType.Challenge then
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_CHALLENGE) > 0 then
timeDown = GuildCarDelayManager.ChallengeCdTime
if timeDown > 0 then
this.timeText.text = string.format("%s后可挑战",TimeToMorS(timeDown))
else
this.timeText.text = string.format("挑战中")
end
else
this.timeText.text = string.format("15点开始抢夺")
end
elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 then
timeDown = GuildCarDelayManager.ChallengeCdTime
if timeDown > 0 then
this.timeText.text = string.format("%s后可抢夺",TimeToMorS(timeDown))
else
this.timeText.text = string.format("抢夺中")
end
else
this.timeText.text = string.format("每日8点开启")
end
else
this.timeText.text = string.format("每日8点开启")
end
--这个结构不适合做==0的判断无奈写了个Timer
if timeDown == 1 then
Timer.New(function ()
CheckRedPointStatus(RedPointType.LegendExplore)
end,1.5):Start()
end
local curStage = GuildFightManager.GetCurFightStage()
if curStage == GUILD_FIGHT_STAGE.DISSMISS or curStage == GUILD_FIGHT_STAGE.CLOSE then
if not _BGMFlag or _BGMFlag == 1 then