Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
JieLing
commit
37a152d311
|
|
@ -2170,7 +2170,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 4864250674772076596}
|
||||
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_LocalScale: {x: 0.7, y: 0.7, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8623671869353108748}
|
||||
m_Father: {fileID: 8772249491636870108}
|
||||
|
|
@ -4991,7 +4991,7 @@ 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: -111.79996, y: -2.2999725}
|
||||
m_AnchoredPosition: {x: -186.1, y: -2.2999725}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8772249490571615140
|
||||
|
|
@ -5029,7 +5029,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
@ -5740,7 +5740,7 @@ 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: 156.9, y: -2.2999725}
|
||||
m_AnchoredPosition: {x: 146.2, y: -4.6}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8772249491387197022
|
||||
|
|
@ -5778,7 +5778,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
|
|||
|
|
@ -9024,7 +9024,7 @@ ParticleSystem:
|
|||
--- !u!199 &3612650515471756776
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -11099,6 +11099,8 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6746052904878408537}
|
||||
- {fileID: 5402033335414744164}
|
||||
- {fileID: 4642889207533507405}
|
||||
- {fileID: 4833444788258854466}
|
||||
m_Father: {fileID: 1612271237950830011}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -15956,7 +15958,7 @@ ParticleSystem:
|
|||
--- !u!199 &2077135144819501974
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -16743,6 +16745,80 @@ Canvas:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingOrder: -5
|
||||
m_TargetDisplay: 0
|
||||
--- !u!1 &1820714377196560032
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4642889207533507405}
|
||||
- component: {fileID: 2353639688071503416}
|
||||
- component: {fileID: 3945772064823693991}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4642889207533507405
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1820714377196560032}
|
||||
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: 522288132675905498}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -6.6, y: -70.69995}
|
||||
m_SizeDelta: {x: 160, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2353639688071503416
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1820714377196560032}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3945772064823693991
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1820714377196560032}
|
||||
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: d69429d22e71bbd439bbf280edeb3a71, 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 &1856101757039447111
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -21445,7 +21521,7 @@ ParticleSystem:
|
|||
--- !u!199 &5382233283546536858
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -29472,7 +29548,7 @@ ParticleSystem:
|
|||
--- !u!199 &7853653569377049714
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35448,7 +35524,7 @@ ParticleSystem:
|
|||
--- !u!199 &4678487443364567018
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -40960,7 +41036,7 @@ ParticleSystem:
|
|||
--- !u!199 &3301434479282110283
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -47001,7 +47077,7 @@ ParticleSystem:
|
|||
--- !u!199 &8426323061574149814
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -52220,7 +52296,7 @@ ParticleSystem:
|
|||
--- !u!199 &3988090302360095373
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -57805,7 +57881,7 @@ ParticleSystem:
|
|||
--- !u!199 &5461926455895321923
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -62929,7 +63005,7 @@ ParticleSystem:
|
|||
--- !u!199 &6960492284779320589
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -69324,7 +69400,7 @@ ParticleSystem:
|
|||
--- !u!199 &4261467272199160834
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -78838,7 +78914,7 @@ ParticleSystem:
|
|||
--- !u!199 &6383407699291000078
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -84980,7 +85056,7 @@ ParticleSystem:
|
|||
--- !u!199 &1706209193022837301
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -91627,7 +91703,7 @@ ParticleSystem:
|
|||
--- !u!199 &8234207848460451360
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -96539,7 +96615,7 @@ ParticleSystem:
|
|||
--- !u!199 &3615746855071839570
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -98284,6 +98360,85 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "17\uFF1A06"
|
||||
--- !u!1 &9135632303427484242
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4833444788258854466}
|
||||
- component: {fileID: 2421940419480631793}
|
||||
- component: {fileID: 2252012453426632457}
|
||||
m_Layer: 5
|
||||
m_Name: time
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4833444788258854466
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9135632303427484242}
|
||||
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: 522288132675905498}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -6.6, y: -70.69995}
|
||||
m_SizeDelta: {x: 191.9, y: 42.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2421940419480631793
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9135632303427484242}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2252012453426632457
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9135632303427484242}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 28
|
||||
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: 40:40:00
|
||||
--- !u!1 &9180903243611135078
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
local floor = math.floor
|
||||
local floor = math.floor
|
||||
local min = math.min
|
||||
local max = math.max
|
||||
--local RoleDataName = RoleDataName
|
||||
|
|
@ -2230,7 +2230,7 @@ local effectList = {
|
|||
BattleUtil.ApplyTreat(caster, target, v)
|
||||
end)
|
||||
end,
|
||||
--组合技能：加一次有动作的自身普攻
|
||||
--组合技能：主动让自己释放一次有动作的自身普攻技能（配置目标选择只能配置成1个目标，否者会释放多次）by：王振兴
|
||||
[116] = function(caster, target, args, interval, skill)
|
||||
LogError("主动加一个普攻")
|
||||
local i1 = args[1]
|
||||
|
|
|
|||
|
|
@ -443,7 +443,7 @@ function this.RequestSendGuildTranscript(func)
|
|||
-- 构建字符串
|
||||
local channel = CHAT_CHANNEL.FAMILY
|
||||
local guildData = MyGuildManager.GetMyGuildInfo()
|
||||
local content = string.format("【%s】发起了集结号角，请全体公会成员前往挑战副本首领！",PlayerManager.nickName)
|
||||
local content = string.format("%s发起了集结号角，请全体公会成员前往挑战副本首领！",PlayerManager.nickName)
|
||||
this.RequestSendChatMsg(channel, content, function()
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
PopupTipPanel.ShowTip(string.format("%s数量不足！",itemName) )
|
||||
return
|
||||
end
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起扫荡？",finalNum,itemName), nil, function()
|
||||
--是否花费XX妖晶购买1次扫荡次数，本次扫荡伤害为XXXXXX
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次扫荡次数，本次扫荡伤害为%s？",finalNum,itemName,GuildTranscriptManager.damage), nil, function()
|
||||
--买东西
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function()
|
||||
PopupTipPanel.ShowTip("成功购买1次扫荡次数！")
|
||||
|
|
@ -114,7 +115,7 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
end)
|
||||
end
|
||||
else
|
||||
MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行挑战吗？",GuildTranscriptManager.damage), nil, function()
|
||||
MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行扫荡吗？",GuildTranscriptManager.damage), nil, function()
|
||||
this.QuickWar()
|
||||
end)
|
||||
end
|
||||
|
|
@ -126,10 +127,14 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
PopupTipPanel.ShowTip(string.format("%s数量不足！",itemName) )
|
||||
return
|
||||
end
|
||||
if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then
|
||||
PopupTipPanel.ShowTip(Language[11705])
|
||||
return
|
||||
end
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数？",finalNum,itemName), nil, function()
|
||||
--买东西
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function()
|
||||
PopupTipPanel.ShowTip("成功购买1次扫荡次数！")
|
||||
PopupTipPanel.ShowTip("成功购买1次挑战次数！")
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权
|
||||
this.ShowEndNumInfo()
|
||||
end)
|
||||
|
|
@ -173,6 +178,10 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
local itemId = curguildCheckpointConfig.AttributePromotePrice[1][1]
|
||||
local buyNum = curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex]
|
||||
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name
|
||||
if not buyNum then
|
||||
PopupTipPanel.ShowTip("强攻效果已到达最高！")
|
||||
return
|
||||
end
|
||||
if buyNum > BagManager.GetItemCountById(itemId) then
|
||||
PopupTipPanel.ShowTip(string.format("%s数量不足！",itemName) )
|
||||
return
|
||||
|
|
@ -267,6 +276,7 @@ function this.SingleChapterDataShow(go,data)
|
|||
lock:SetActive(true)
|
||||
mask:SetActive(true)
|
||||
end
|
||||
this.SelectImage:SetActive(false)
|
||||
if cutOpenIndex == data.Id then
|
||||
this.SetSelectImagePos(go)
|
||||
end
|
||||
|
|
@ -347,6 +357,9 @@ function this.ShowBossInfo()
|
|||
this.bossHerobg.sprite = Util.LoadSprite(GetHeroCardStarBg[curheroConfig.Star])
|
||||
this.bossHerohpPass.fillAmount = GuildTranscriptManager.GetBlood()/10000
|
||||
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
|
||||
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
|
||||
this.bossHerohpPassText.text = "已通关"
|
||||
end
|
||||
local liveName = GetResourcePath(curheroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
|
@ -378,19 +391,19 @@ function this.ShowRewardInfo()
|
|||
reward2Data[2] = {96,cutOpenIndexConFig.LegionExp}
|
||||
for i = 1, #reward1Data do
|
||||
if itemList[this.reward1.name][i] then
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting)
|
||||
else
|
||||
itemList[this.reward1.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward1.transform)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting)
|
||||
end
|
||||
itemList[this.reward1.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
for i = 1, #reward2Data do
|
||||
if itemList[this.reward2.name][i] then
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting)
|
||||
else
|
||||
itemList[this.reward2.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward2.transform)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting)
|
||||
end
|
||||
itemList[this.reward2.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
|
|
@ -437,9 +450,12 @@ function this.ShowBuffData()
|
|||
attackBuffNum = math.floor(addNum[1][2]/100)
|
||||
end
|
||||
local GetbuffTime = GuildTranscriptManager.GetbuffTime() > 0 and GuildTranscriptManager.GetbuffTime() - PlayerManager.serverTime or 0
|
||||
Util.SetGray(this.attackInfoTextGo,attackBuffNum == 0)
|
||||
LogGreen("attackBuffNum "..GetbuffTime)
|
||||
this.attackInfoText.text = string.format("全军团成员攻击力+ %s ",attackBuffNum).."%"
|
||||
if attackBuffNum == 0 then
|
||||
--<color=#FCF5D3FF>%s</color>
|
||||
this.attackInfoText.text = "<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> "
|
||||
else
|
||||
this.attackInfoText.text = string.format("<color=#FFDAB6>全公会成员攻击力+ %s ",attackBuffNum).."%</color>"
|
||||
end
|
||||
this.RemainTimeDown(this.attackInfoTime, GetbuffTime)
|
||||
end
|
||||
this.timer = Timer.New()
|
||||
|
|
@ -486,11 +502,12 @@ function this.TimeStampToDateString(second)
|
|||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor( second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
|
||||
return string.format("(%s:%s:后失效)", minute, sec)
|
||||
end
|
||||
|
||||
function this.SetSelectImagePos(parent)
|
||||
Util.SetGray(this.SelectImage,false)
|
||||
this.SelectImage:SetActive(true)
|
||||
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
||||
this.SelectImage:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
this.SelectImage:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ function this:InitComponent()
|
|||
|
||||
-- 云梦祈福
|
||||
this.paryGift = Util.GetGameObject(self.gameObject, "RightUp/paryGift")
|
||||
this.paryGiftTime = Util.GetGameObject(self.gameObject, "RightUp/paryGift/time"):GetComponent("Text")
|
||||
|
||||
-- 战力排行
|
||||
this.warPowerSort = Util.GetGameObject(self.gameObject, "RightUp/warPowerSort")
|
||||
|
|
@ -1356,9 +1357,26 @@ function this.TimeFormat()
|
|||
if QingLong then
|
||||
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
|
||||
local tempTime = info.endTime - PlayerManager.serverTime
|
||||
tempTime = math.floor(tempTime/86400)
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
this.treasureOfSlText.text = tempTime.."天"
|
||||
if tempTime>= 86400 then
|
||||
this.treasureOfSlText.text = TimeToDH(tempTime)
|
||||
else
|
||||
this.treasureOfSlText.text = TimeToHMS(tempTime)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--云梦祈福
|
||||
local YunMeng = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Pray)
|
||||
if YunMeng then
|
||||
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Pray)
|
||||
local tempTime = info.endTime - PlayerManager.serverTime
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.Pray) then
|
||||
if tempTime>= 86400 then
|
||||
this.paryGiftTime.text = TimeToDH(tempTime)
|
||||
else
|
||||
this.paryGiftTime.text = TimeToHMS(tempTime)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -2212,7 +2212,7 @@
|
|||
12212,宝物分解
|
||||
12213,无可分解宝物！
|
||||
12214,最多选择%s个宝物！
|
||||
12215,请选择需要分解的宝器!
|
||||
12215,请选择需要分解的宝物!
|
||||
12216,这里？
|
||||
12217,无法用于无限循环的方法
|
||||
12218,未命中
|
||||
|
|
@ -2270,8 +2270,8 @@
|
|||
12270,材料
|
||||
12271,(注意：本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备！)
|
||||
12272,出售数量不可为0个
|
||||
12273,宝物将分解为宝魂，若宝物已强化或精炼，分解后将清空强化和精炼等级，并100%返还养成材料。
|
||||
12274,(注意：本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器！)
|
||||
12273,宝物将分解为
|
||||
12274,(注意：本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝物！)
|
||||
12275,分解后获得：
|
||||
12276,神将归元成功\，等级重置为1级
|
||||
12277,未查询到符合条件的装备！
|
||||
|
|
@ -2291,3 +2291,4 @@
|
|||
12291,请选择需要合成的神将
|
||||
12292,%s星同阵营神将
|
||||
12293,完成上方任务即可免费领取神将
|
||||
12294,，若宝物已强化或精炼，分解后将清空强化和精炼等级，并100%返还养成材料。
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue