Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
948f47398c
|
@ -659,7 +659,7 @@ GameObject:
|
||||||
- component: {fileID: 114451904932443988}
|
- component: {fileID: 114451904932443988}
|
||||||
- component: {fileID: 114829984440603480}
|
- component: {fileID: 114829984440603480}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: tabs_1
|
m_Name: tabs_5
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -679,7 +679,7 @@ RectTransform:
|
||||||
- {fileID: 568639522917424682}
|
- {fileID: 568639522917424682}
|
||||||
- {fileID: 9168254092259534281}
|
- {fileID: 9168254092259534281}
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 4
|
||||||
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}
|
||||||
|
@ -896,7 +896,7 @@ GameObject:
|
||||||
- component: {fileID: 222223956725511446}
|
- component: {fileID: 222223956725511446}
|
||||||
- component: {fileID: 8617049428068780533}
|
- component: {fileID: 8617049428068780533}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: page_1
|
m_Name: page_5
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -916,7 +916,7 @@ RectTransform:
|
||||||
- {fileID: 863016053}
|
- {fileID: 863016053}
|
||||||
- {fileID: 3467050837168159327}
|
- {fileID: 3467050837168159327}
|
||||||
m_Father: {fileID: 224326955275377428}
|
m_Father: {fileID: 224326955275377428}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -1301,11 +1301,11 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 224364277726372388}
|
- {fileID: 5615828735167990986}
|
||||||
- {fileID: 224114314216780152}
|
- {fileID: 224114314216780152}
|
||||||
- {fileID: 6755377465913552352}
|
- {fileID: 6755377465913552352}
|
||||||
- {fileID: 897629116163733771}
|
- {fileID: 897629116163733771}
|
||||||
- {fileID: 5615828735167990986}
|
- {fileID: 224364277726372388}
|
||||||
- {fileID: 1384613452998036532}
|
- {fileID: 1384613452998036532}
|
||||||
- {fileID: 8814220106900169789}
|
- {fileID: 8814220106900169789}
|
||||||
m_Father: {fileID: 224859010172153270}
|
m_Father: {fileID: 224859010172153270}
|
||||||
|
@ -1354,15 +1354,15 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 224980375280759174}
|
- {fileID: 2114283670694146732}
|
||||||
- {fileID: 224748070802756234}
|
- {fileID: 224748070802756234}
|
||||||
- {fileID: 224141371839801236}
|
- {fileID: 224141371839801236}
|
||||||
- {fileID: 1487702711196035133}
|
- {fileID: 1487702711196035133}
|
||||||
- {fileID: 2114283670694146732}
|
- {fileID: 224980375280759174}
|
||||||
- {fileID: 3048090068103662213}
|
- {fileID: 6064278685194838120}
|
||||||
- {fileID: 8814220107145403555}
|
- {fileID: 8814220107145403555}
|
||||||
- {fileID: 8814220106497423369}
|
- {fileID: 8814220106497423369}
|
||||||
- {fileID: 6064278685194838120}
|
- {fileID: 3048090068103662213}
|
||||||
- {fileID: 375785417472329793}
|
- {fileID: 375785417472329793}
|
||||||
- {fileID: 1209172527590496317}
|
- {fileID: 1209172527590496317}
|
||||||
- {fileID: 7741194408981798387}
|
- {fileID: 7741194408981798387}
|
||||||
|
@ -2709,7 +2709,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -8.5}
|
m_AnchoredPosition: {x: 0, y: -8.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: -540.86, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &2790220155273969555
|
--- !u!114 &2790220155273969555
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -8120,12 +8120,12 @@ GameObject:
|
||||||
- component: {fileID: 5285331927146186406}
|
- component: {fileID: 5285331927146186406}
|
||||||
- component: {fileID: 5412330582740733119}
|
- component: {fileID: 5412330582740733119}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: page_5
|
m_Name: page_1
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
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 &5615828735167990986
|
--- !u!224 &5615828735167990986
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -8140,7 +8140,7 @@ RectTransform:
|
||||||
- {fileID: 1134928736819784042}
|
- {fileID: 1134928736819784042}
|
||||||
- {fileID: 5163948428886061200}
|
- {fileID: 5163948428886061200}
|
||||||
m_Father: {fileID: 224326955275377428}
|
m_Father: {fileID: 224326955275377428}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -34013,7 +34013,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 &7741194408981798387
|
--- !u!224 &7741194408981798387
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -34030,9 +34030,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 11
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 450, y: -92}
|
||||||
m_SizeDelta: {x: 184, y: 184}
|
m_SizeDelta: {x: 184, y: 184}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2425244200170157868
|
--- !u!222 &2425244200170157868
|
||||||
|
@ -55192,7 +55192,7 @@ GameObject:
|
||||||
- component: {fileID: 3288181376871965593}
|
- component: {fileID: 3288181376871965593}
|
||||||
- component: {fileID: 8267326687302504792}
|
- component: {fileID: 8267326687302504792}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: tabs_6
|
m_Name: tabs_9
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -55212,7 +55212,7 @@ RectTransform:
|
||||||
- {fileID: 3671343191984081671}
|
- {fileID: 3671343191984081671}
|
||||||
- {fileID: 4627928063106812431}
|
- {fileID: 4627928063106812431}
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 8
|
||||||
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}
|
||||||
|
@ -83136,7 +83136,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 154}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &7054035270899119123
|
--- !u!222 &7054035270899119123
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -115319,7 +115319,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 &375785417472329793
|
--- !u!224 &375785417472329793
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -115336,9 +115336,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 92, y: -92}
|
||||||
m_SizeDelta: {x: 184, y: 184}
|
m_SizeDelta: {x: 184, y: 184}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5911972339559834340
|
--- !u!222 &5911972339559834340
|
||||||
|
@ -115491,10 +115491,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 2547574702630156647}
|
m_Father: {fileID: 2547574702630156647}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 140, y: -87}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 150, y: 134}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3176581777211206878
|
--- !u!222 &3176581777211206878
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -120563,7 +120563,7 @@ GameObject:
|
||||||
- component: {fileID: 1268959317132352573}
|
- component: {fileID: 1268959317132352573}
|
||||||
- component: {fileID: 6874443795423049374}
|
- component: {fileID: 6874443795423049374}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: tabs_9
|
m_Name: tabs_6
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -120583,7 +120583,7 @@ RectTransform:
|
||||||
- {fileID: 7985051096529203752}
|
- {fileID: 7985051096529203752}
|
||||||
- {fileID: 6913033910568031851}
|
- {fileID: 6913033910568031851}
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 8
|
m_RootOrder: 5
|
||||||
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}
|
||||||
|
@ -120845,7 +120845,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 &1209172527590496317
|
--- !u!224 &1209172527590496317
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -120862,9 +120862,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 10
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 271, y: -92}
|
||||||
m_SizeDelta: {x: 184, y: 184}
|
m_SizeDelta: {x: 184, y: 184}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4083780535237785567
|
--- !u!222 &4083780535237785567
|
||||||
|
@ -136776,7 +136776,7 @@ GameObject:
|
||||||
- component: {fileID: 3458708719321431360}
|
- component: {fileID: 3458708719321431360}
|
||||||
- component: {fileID: 871490940080290256}
|
- component: {fileID: 871490940080290256}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: tabs_5
|
m_Name: tabs_1
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
@ -136796,7 +136796,7 @@ RectTransform:
|
||||||
- {fileID: 8558366772861491315}
|
- {fileID: 8558366772861491315}
|
||||||
- {fileID: 6754087034341056255}
|
- {fileID: 6754087034341056255}
|
||||||
m_Father: {fileID: 224613153558090644}
|
m_Father: {fileID: 224613153558090644}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 0
|
||||||
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}
|
||||||
|
|
|
@ -284,7 +284,6 @@ end
|
||||||
|
|
||||||
function this.GetActivityOpenStatus(type)
|
function this.GetActivityOpenStatus(type)
|
||||||
if this.mission[type] then
|
if this.mission[type] then
|
||||||
LogGreen(this.mission[type].reallyOpen)
|
|
||||||
return this.mission[type].reallyOpen == 1
|
return this.mission[type].reallyOpen == 1
|
||||||
else
|
else
|
||||||
Log(string.format(Language[10002], type))
|
Log(string.format(Language[10002], type))
|
||||||
|
|
|
@ -3503,8 +3503,6 @@ local passivityList = {
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.BuffCaster, onBuffCaster)
|
role.Event:AddEvent(BattleEventName.BuffCaster, onBuffCaster)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
|
||||||
-- 直接伤害击杀目标对仇恨目标造成[a]%物理伤害
|
-- 直接伤害击杀目标对仇恨目标造成[a]%物理伤害
|
||||||
-- a[float]
|
-- a[float]
|
||||||
[185] = function(role, args)
|
[185] = function(role, args)
|
||||||
|
@ -4726,5 +4724,37 @@ local passivityList = {
|
||||||
end
|
end
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, _OnRoleRealDead)
|
BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, _OnRoleRealDead)
|
||||||
end,
|
end,
|
||||||
|
-- 释放技能有[a]%概率释放[b]技能。
|
||||||
|
-- a[float]b[int]
|
||||||
|
[242] = function(role, args)
|
||||||
|
local f1 = args[1]
|
||||||
|
local f2 = args[2]
|
||||||
|
-- 释放技能后
|
||||||
|
local onSkillEnd = function(skill)
|
||||||
|
if skill and skill.type == BattleSkillType.Special then
|
||||||
|
BattleUtil.RandomAction(f1, function()
|
||||||
|
--BattleLogic.WaitForTrigger(0.1, function()
|
||||||
|
LogError("技能触发再次释放技能"..f2)
|
||||||
|
role:InsertExtraSkill(f2)
|
||||||
|
--end)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd)
|
||||||
|
end,
|
||||||
|
-- 直接伤害击杀目标释放[a]技能。
|
||||||
|
-- a[float]
|
||||||
|
[243] = function(role, args)
|
||||||
|
local f1 = args[1]
|
||||||
|
local onRoleHit = function(target)
|
||||||
|
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||||
|
-- local target = RoleManager.GetAliveAggro(role)
|
||||||
|
--BattleUtil.CalDamage(nil, role, target, 1, f1)
|
||||||
|
role:InsertExtraSkill(f1)
|
||||||
|
LogError("击杀触发再次释放技能")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit)
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
return passivityList
|
return passivityList
|
|
@ -186,6 +186,8 @@ BattleSkillType = {
|
||||||
Monster = 0,
|
Monster = 0,
|
||||||
Normal = 1,
|
Normal = 1,
|
||||||
Special = 2,
|
Special = 2,
|
||||||
|
--额外技能
|
||||||
|
Extra = 3,
|
||||||
}
|
}
|
||||||
|
|
||||||
CountTypeName = {
|
CountTypeName = {
|
||||||
|
@ -202,6 +204,15 @@ ShieldTypeName = {
|
||||||
AllReduce = 3, -- 无敌护盾
|
AllReduce = 3, -- 无敌护盾
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--额外释放技能
|
||||||
|
ExtraReleaseSkill={
|
||||||
|
skill1={1012051,1,0,1,{200000,{1,0.41,2}}},
|
||||||
|
skill2={1132051,0.8,0,1,{200212,{1,0.89,2}}},
|
||||||
|
skill3={1151111,0.05,0,1,{220000,1,0.86,2}},
|
||||||
|
skill4={10000351,0.3,0.5,4,{400000,{1,1.75,1}}},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- 战斗表属性id对应战斗中属性数据
|
-- 战斗表属性id对应战斗中属性数据
|
||||||
BattlePropList = {
|
BattlePropList = {
|
||||||
|
|
|
@ -368,6 +368,19 @@ end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 根据id获取额外技能
|
||||||
|
function BattleUtil.GetExtraSkillbyId(id)
|
||||||
|
if id==1 then
|
||||||
|
return ExtraReleaseSkill.skill1
|
||||||
|
elseif id==2 then
|
||||||
|
return ExtraReleaseSkill.skill2
|
||||||
|
elseif id==3 then
|
||||||
|
return ExtraReleaseSkill.skill3
|
||||||
|
elseif id==4 then
|
||||||
|
return ExtraReleaseSkill.skill4
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType)
|
function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType)
|
||||||
if damage < 0 then damage = 0 end
|
if damage < 0 then damage = 0 end
|
||||||
local finalDmg = defRole.data:SubValue(RoleDataName.Hp, damage)
|
local finalDmg = defRole.data:SubValue(RoleDataName.Hp, damage)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
RoleLogic = {}
|
RoleLogic = {}
|
||||||
RoleLogic.__index = RoleLogic
|
RoleLogic.__index = RoleLogic
|
||||||
--local RoleLogic = RoleLogic
|
--local RoleLogic = RoleLogic
|
||||||
--local RoleDataName = RoleDataName
|
--local RoleDataName = RoleDataName
|
||||||
|
@ -47,7 +47,6 @@ function RoleLogic:Init(uid, data, position)
|
||||||
|
|
||||||
self.skill = data.skill
|
self.skill = data.skill
|
||||||
self.superSkill = data.superSkill
|
self.superSkill = data.superSkill
|
||||||
|
|
||||||
--首次读条时间=速度/(20*(等级+10)
|
--首次读条时间=速度/(20*(等级+10)
|
||||||
self.sp = 0
|
self.sp = 0
|
||||||
local time = self:GetRoleData(RoleDataName.Speed)/(20*(self:GetRoleData(RoleDataName.Level)+10))
|
local time = self:GetRoleData(RoleDataName.Speed)/(20*(self:GetRoleData(RoleDataName.Level)+10))
|
||||||
|
@ -378,6 +377,26 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets)
|
||||||
"targets", targets and #targets or "0"
|
"targets", targets and #targets or "0"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--加入额外技能,用于额外释放技能 by:王振兴
|
||||||
|
function RoleLogic:InsertExtraSkill(id)
|
||||||
|
local effectData=BattleUtil.GetExtraSkillbyId(id)
|
||||||
|
if effectData then
|
||||||
|
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
|
||||||
|
SkillManager.InsertSkill(self, effectData, BattleSkillType.Special, nil, true, false)
|
||||||
|
BattleLogManager.Log(
|
||||||
|
"Add Skill",
|
||||||
|
"camp", self.camp,
|
||||||
|
"pos", self.position,
|
||||||
|
"type", BattleSkillType.Extra,
|
||||||
|
"isRage", tostring(false),
|
||||||
|
"isAdd", tostring(true),
|
||||||
|
"targets", targets and #targets or "0"
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
-- 插入一个技能
|
-- 插入一个技能
|
||||||
function RoleLogic:InsertSkill(type, isRage, isAdd, targets)
|
function RoleLogic:InsertSkill(type, isRage, isAdd, targets)
|
||||||
if not self.IsCanAddSkill and isAdd then return end
|
if not self.IsCanAddSkill and isAdd then return end
|
||||||
|
@ -488,7 +507,7 @@ function RoleLogic:IsDead()
|
||||||
return self.isDead
|
return self.isDead
|
||||||
end
|
end
|
||||||
function RoleLogic:IsRealDead()
|
function RoleLogic:IsRealDead()
|
||||||
return self.isRealDead
|
return self.isRealDead
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ local kMaxTab = 11
|
||||||
|
|
||||||
--显示类型 type 面板类型 body 显示页签索引
|
--显示类型 type 面板类型 body 显示页签索引
|
||||||
local ShowType={
|
local ShowType={
|
||||||
Welfare={type=1,body={1,2,5,9}},--福利
|
Welfare={type=1,body={1,2,5,6}},--福利
|
||||||
MonthFund={type=2,body={7,8}} --超值基金
|
MonthFund={type=2,body={7,8}} --超值基金
|
||||||
}
|
}
|
||||||
local TabToContent = {
|
local TabToContent = {
|
||||||
|
@ -30,13 +30,13 @@ local TabToContent = {
|
||||||
[3] = 3,
|
[3] = 3,
|
||||||
[4] = 4,
|
[4] = 4,
|
||||||
[5] = 5,
|
[5] = 5,
|
||||||
[6] = 6,
|
[6] = 5,
|
||||||
[7] = 7,
|
[7] = 7,
|
||||||
[8] = 7,
|
[8] = 7,
|
||||||
[9] = 1,
|
[9] = 6,
|
||||||
[10] = 1,
|
[10] = 5,
|
||||||
[11] = 1,
|
[11] = 5,
|
||||||
[12] = 1,
|
[12] = 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
local kMaxTab = #TabToContent
|
local kMaxTab = #TabToContent
|
||||||
|
@ -53,11 +53,11 @@ function OperatingPanel:InitComponent()
|
||||||
end
|
end
|
||||||
self.selectTabIndex = -1
|
self.selectTabIndex = -1
|
||||||
self.operatingContents = {
|
self.operatingContents = {
|
||||||
[1] = WeekMonthGiftPackPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
[1] = CumulativeSignIn.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||||
[2] = MonthCardPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
[2] = MonthCardPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||||
[3] = GrowthGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
[3] = GrowthGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
||||||
[4] = ContinuityRechargePage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
[4] = ContinuityRechargePage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
||||||
[5] = CumulativeSignIn.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
|
[5] = WeekMonthGiftPackPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
|
||||||
[6] = AttentionGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
|
[6] = AttentionGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
|
||||||
[7] = UpperMonthCard:New(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
|
[7] = UpperMonthCard:New(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
|
||||||
}
|
}
|
||||||
|
@ -65,11 +65,11 @@ function OperatingPanel:InitComponent()
|
||||||
content:OnHide()
|
content:OnHide()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
BindRedPointObject(RedPointType.GiftPage, Util.GetGameObject(self.operateTabs[1], "redPoint"))
|
BindRedPointObject(RedPointType.CumulativeSignIn, Util.GetGameObject(self.operateTabs[1], "redPoint"))
|
||||||
|
BindRedPointObject(RedPointType.GiftPage, Util.GetGameObject(self.operateTabs[5], "redPoint"))
|
||||||
BindRedPointObject(RedPointType.MonthCard, Util.GetGameObject(self.operateTabs[2], "redPoint"))
|
BindRedPointObject(RedPointType.MonthCard, Util.GetGameObject(self.operateTabs[2], "redPoint"))
|
||||||
BindRedPointObject(RedPointType.GrowthGift, Util.GetGameObject(self.operateTabs[3], "redPoint"))
|
BindRedPointObject(RedPointType.GrowthGift, Util.GetGameObject(self.operateTabs[3], "redPoint"))
|
||||||
-- BindRedPointObject(RedPointType.ContinuityRecharge, Util.GetGameObject(self.operateTabs[4], "redPoint"))
|
-- BindRedPointObject(RedPointType.ContinuityRecharge, Util.GetGameObject(self.operateTabs[4], "redPoint"))
|
||||||
BindRedPointObject(RedPointType.CumulativeSignIn, Util.GetGameObject(self.operateTabs[5], "redPoint"))
|
|
||||||
|
|
||||||
-- 上部货币显示
|
-- 上部货币显示
|
||||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft })
|
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft })
|
||||||
|
@ -148,7 +148,7 @@ function OperatingPanel:OnDestroy()
|
||||||
end
|
end
|
||||||
|
|
||||||
function OperatingPanel:OnTabClicked(index)
|
function OperatingPanel:OnTabClicked(index)
|
||||||
if index == 6 then --第6个是什么绑定手鸡
|
if index == 9 then --第9个是什么绑定手鸡
|
||||||
PopupTipPanel.ShowTip(Language[11487])
|
PopupTipPanel.ShowTip(Language[11487])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -178,10 +178,10 @@ function OperatingPanel:ShowTabContent(index)
|
||||||
self.operatingContents[oldContent]:OnHide()
|
self.operatingContents[oldContent]:OnHide()
|
||||||
end
|
end
|
||||||
|
|
||||||
if index == 1 then
|
if index == 5 then
|
||||||
self.operatingContents[curContent]:OnShow(self.sortingOrder, 1)
|
self.operatingContents[curContent]:OnShow(self.sortingOrder, 1)
|
||||||
return
|
return
|
||||||
elseif index == 9 then
|
elseif index == 6 then
|
||||||
self.operatingContents[curContent]:OnShow(self.sortingOrder, 2)
|
self.operatingContents[curContent]:OnShow(self.sortingOrder, 2)
|
||||||
return
|
return
|
||||||
elseif index==10 then
|
elseif index==10 then
|
||||||
|
@ -242,9 +242,9 @@ function OperatingPanel:RefreshTabStatus()
|
||||||
end
|
end
|
||||||
|
|
||||||
if not RECHARGEABLE then--(是否开启充值)
|
if not RECHARGEABLE then--(是否开启充值)
|
||||||
self.operateTabs[1]:SetActive(false)
|
self.operateTabs[5]:SetActive(false)
|
||||||
self.operateTabs[2]:SetActive(false)
|
self.operateTabs[2]:SetActive(false)
|
||||||
self.operateTabs[9]:SetActive(false)
|
self.operateTabs[6]:SetActive(false)
|
||||||
self.operateTabs[3]:SetActive(false)
|
self.operateTabs[3]:SetActive(false)
|
||||||
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
|
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
|
||||||
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
|
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
|
||||||
|
@ -255,7 +255,7 @@ function OperatingPanel:RefreshTabStatus()
|
||||||
end
|
end
|
||||||
|
|
||||||
function OperatingPanel:GetPriorityIndex()
|
function OperatingPanel:GetPriorityIndex()
|
||||||
local index = 5
|
local index = 1
|
||||||
for idx, operateItem in ipairs(self.operateTabs) do
|
for idx, operateItem in ipairs(self.operateTabs) do
|
||||||
if Util.GetGameObject(operateItem, "redPoint").activeSelf then
|
if Util.GetGameObject(operateItem, "redPoint").activeSelf then
|
||||||
index = idx
|
index = idx
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue