Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
6a14154c89
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
|
|
@ -5094,6 +5094,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3569102849833951929}
|
- {fileID: 3569102849833951929}
|
||||||
|
- {fileID: 3977989870992202207}
|
||||||
m_Father: {fileID: 224361279008326358}
|
m_Father: {fileID: 224361279008326358}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -34657,6 +34658,102 @@ MonoBehaviour:
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: New Text
|
m_Text: New Text
|
||||||
|
--- !u!1 &801322049959554458
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3977989870992202207}
|
||||||
|
- component: {fileID: 7027282258947088492}
|
||||||
|
- component: {fileID: 1992244774151148903}
|
||||||
|
- component: {fileID: 2852671195478684251}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3977989870992202207
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 801322049959554458}
|
||||||
|
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: 224969362660561018}
|
||||||
|
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: 4, y: 65}
|
||||||
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &7027282258947088492
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 801322049959554458}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1992244774151148903
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 801322049959554458}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.9811321, g: 0.97976804, b: 0.9765041, 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: 30
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 2
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "17:20:01\u540E\u5237\u65B0"
|
||||||
|
LanguageIndex: 11485
|
||||||
|
--- !u!114 &2852671195478684251
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 801322049959554458}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
|
m_EffectDistance: {x: 1, y: -1}
|
||||||
|
m_UseGraphicAlpha: 1
|
||||||
--- !u!1 &1208514559779824828
|
--- !u!1 &1208514559779824828
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -34689,9 +34786,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 3569102849833951929}
|
m_Father: {fileID: 3569102849833951929}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
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: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 211.66666, y: -38.15}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 75, y: 100}
|
m_SizeDelta: {x: 75, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1680150351488365573
|
--- !u!222 &1680150351488365573
|
||||||
|
|
@ -34770,9 +34867,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 3569102849833951929}
|
m_Father: {fileID: 3569102849833951929}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
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: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 124.6, y: -38.15}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 75, y: 75}
|
m_SizeDelta: {x: 75, y: 75}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2369707987322037555
|
--- !u!222 &2369707987322037555
|
||||||
|
|
@ -34940,9 +35037,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 3569102849833951929}
|
m_Father: {fileID: 3569102849833951929}
|
||||||
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: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 40.533333, y: -38.15}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 69, y: 100}
|
m_SizeDelta: {x: 69, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3178489416745694411
|
--- !u!222 &3178489416745694411
|
||||||
|
|
@ -35079,7 +35176,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &3569102849833951929
|
--- !u!224 &3569102849833951929
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -5343,6 +5343,7 @@ RectTransform:
|
||||||
- {fileID: 6156873677863081714}
|
- {fileID: 6156873677863081714}
|
||||||
- {fileID: 6515698538503102765}
|
- {fileID: 6515698538503102765}
|
||||||
- {fileID: 4985255296929210884}
|
- {fileID: 4985255296929210884}
|
||||||
|
- {fileID: 6718948033658500775}
|
||||||
m_Father: {fileID: 224779384557668594}
|
m_Father: {fileID: 224779384557668594}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -128550,7 +128551,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
||||||
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: -9.299999, y: 4.2}
|
m_AnchoredPosition: {x: -9.300003, y: 4.200001}
|
||||||
m_SizeDelta: {x: 1.4, y: 1.4}
|
m_SizeDelta: {x: 1.4, y: 1.4}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &222431668941950158
|
--- !u!222 &222431668941950158
|
||||||
|
|
@ -128939,7 +128940,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
||||||
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.000015258789, y: -0}
|
m_AnchoredPosition: {x: 0.000015258789, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &222690519356434136
|
--- !u!222 &222690519356434136
|
||||||
|
|
@ -135112,7 +135113,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
|
||||||
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: 3, y: 5.3}
|
m_AnchoredPosition: {x: 3, y: 5.299999}
|
||||||
m_SizeDelta: {x: -67.64, y: -25.2}
|
m_SizeDelta: {x: -67.64, y: -25.2}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1989292816312034440
|
--- !u!222 &1989292816312034440
|
||||||
|
|
@ -135123,6 +135124,102 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7257005729978659308}
|
m_GameObject: {fileID: 7257005729978659308}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &7431293060587237766
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6718948033658500775}
|
||||||
|
- component: {fileID: 3983152725215165347}
|
||||||
|
- component: {fileID: 7420109698367600387}
|
||||||
|
- component: {fileID: 174395308460730710}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6718948033658500775
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431293060587237766}
|
||||||
|
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: 224231502868826472}
|
||||||
|
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: 3, y: 65}
|
||||||
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3983152725215165347
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431293060587237766}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7420109698367600387
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431293060587237766}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.9811321, g: 0.97976804, b: 0.9765041, 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: 30
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 2
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "17:20:01\u540E\u5237\u65B0"
|
||||||
|
LanguageIndex: 11485
|
||||||
|
--- !u!114 &174395308460730710
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431293060587237766}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
|
m_EffectDistance: {x: 1, y: -1}
|
||||||
|
m_UseGraphicAlpha: 1
|
||||||
--- !u!1 &8347306111350801234
|
--- !u!1 &8347306111350801234
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -523,6 +523,7 @@ UpViewRechargeType = {
|
||||||
Celebration = 50003,--社稷赏
|
Celebration = 50003,--社稷赏
|
||||||
PuTiZi = 1203,--菩提子
|
PuTiZi = 1203,--菩提子
|
||||||
XianLingCao = 1202,--仙灵草
|
XianLingCao = 1202,--仙灵草
|
||||||
|
QuLingBi = 1205,--驱灵币
|
||||||
YHMF= 21,--妖魂魔符
|
YHMF= 21,--妖魂魔符
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2271,9 +2271,17 @@ local effectList = {
|
||||||
BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true)
|
BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true)
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
--瞬间恢复[a]*[b]%生命
|
||||||
|
--a[属性],b[float]
|
||||||
|
[119] = function(caster, target, args, interval, skill)
|
||||||
|
local pro1 = args[1]
|
||||||
|
local f1 = args[2]
|
||||||
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
|
local val = floor(BattleUtil.FP_Mul(target:GetRoleData(BattlePropList[pro1]), f1))
|
||||||
|
BattleUtil.CalTreat(caster, target, val)
|
||||||
|
end)
|
||||||
|
end,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return effectList
|
return effectList
|
||||||
|
|
@ -1910,7 +1910,8 @@ local passivityList = {
|
||||||
[109] = function(role, args)
|
[109] = function(role, args)
|
||||||
local i1 = args[1]
|
local i1 = args[1]
|
||||||
local onBeSkillCastEnd = function(skill)
|
local onBeSkillCastEnd = function(skill)
|
||||||
if skill.type == BattleSkillType.Normal then
|
--同阵营普工加血不触发被动
|
||||||
|
if skill.type == BattleSkillType.Normal and skill.owner and skill.owner.camp~=role.camp then
|
||||||
role:AddRage(i1, CountTypeName.Add)
|
role:AddRage(i1, CountTypeName.Add)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -2495,7 +2496,8 @@ local passivityList = {
|
||||||
|
|
||||||
-- 普攻后
|
-- 普攻后
|
||||||
local onSkillEnd = function(skill)
|
local onSkillEnd = function(skill)
|
||||||
if skill.type == BattleSkillType.Normal then
|
--己方普攻不会触发被动
|
||||||
|
if skill.type == BattleSkillType.Normal and skill.owner and skill.owner.camp~=role.camp then
|
||||||
local caster = skill.owner
|
local caster = skill.owner
|
||||||
local attack = role:GetRoleData(RoleDataName.Attack)
|
local attack = role:GetRoleData(RoleDataName.Attack)
|
||||||
local damage = floor(BattleUtil.ErrorCorrection(attack * 0.2))
|
local damage = floor(BattleUtil.ErrorCorrection(attack * 0.2))
|
||||||
|
|
@ -2747,6 +2749,7 @@ local passivityList = {
|
||||||
|
|
||||||
-- 技能后后
|
-- 技能后后
|
||||||
local onRoleBeHit = function(caster)
|
local onRoleBeHit = function(caster)
|
||||||
|
|
||||||
local attack = role:GetRoleData(RoleDataName.Attack)
|
local attack = role:GetRoleData(RoleDataName.Attack)
|
||||||
local damage = floor(BattleUtil.ErrorCorrection(attack * 0.2))
|
local damage = floor(BattleUtil.ErrorCorrection(attack * 0.2))
|
||||||
BattleUtil.RandomDot(f1, dot, role, caster, i1, 1, damage)
|
BattleUtil.RandomDot(f1, dot, role, caster, i1, 1, damage)
|
||||||
|
|
@ -3025,7 +3028,7 @@ local passivityList = {
|
||||||
|
|
||||||
-- 技能后后
|
-- 技能后后
|
||||||
local onBeSkillCastEnd = function(skill)
|
local onBeSkillCastEnd = function(skill)
|
||||||
if skill.type == BattleSkillType.Normal then
|
if skill.type == BattleSkillType.Normal and skill.owner and skill.owner.camp~=role.camp then
|
||||||
local attack = role:GetRoleData(RoleDataName.Attack)
|
local attack = role:GetRoleData(RoleDataName.Attack)
|
||||||
local damage = floor(BattleUtil.ErrorCorrection(attack * f2))
|
local damage = floor(BattleUtil.ErrorCorrection(attack * f2))
|
||||||
BattleUtil.RandomDot(f1, dot, role, skill.owner, i1, 1, damage)
|
BattleUtil.RandomDot(f1, dot, role, skill.owner, i1, 1, damage)
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@ function this:InitComponent()
|
||||||
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
|
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
|
||||||
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715),
|
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715),
|
||||||
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
|
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
|
||||||
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1400),
|
||||||
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110),
|
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110),
|
||||||
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110),
|
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110),
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),
|
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),
|
||||||
|
|
@ -274,7 +274,7 @@ function this:InitComponent()
|
||||||
-- [FUNCTION_OPEN_TYPE.DIFFER_DEMONS] = this:AddFuncItem(this.btnYiYao, 0),
|
-- [FUNCTION_OPEN_TYPE.DIFFER_DEMONS] = this:AddFuncItem(this.btnYiYao, 0),
|
||||||
-- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:AddFuncItem(this.btnWaiDi, 0),
|
-- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:AddFuncItem(this.btnWaiDi, 0),
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
|
||||||
[FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, 0),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换
|
||||||
}
|
}
|
||||||
|
|
||||||
this.operateNewText = {
|
this.operateNewText = {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ function PokemonSummonOneResultPanel:InitComponent()
|
||||||
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
|
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
|
||||||
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
|
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
|
||||||
this.itemInfo3=Util.GetGameObject(this.content3, "info"):GetComponent("Text")
|
this.itemInfo3=Util.GetGameObject(this.content3, "info"):GetComponent("Text")
|
||||||
|
this.tipText=Util.GetGameObject(this.openOneAgainButton, "Text"):GetComponent("Text")
|
||||||
this.content=Util.GetGameObject(self.gameObject, "content")
|
this.content=Util.GetGameObject(self.gameObject, "content")
|
||||||
this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
|
this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
|
||||||
this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text")
|
this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text")
|
||||||
|
|
@ -112,6 +112,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
|
||||||
this.itemNum3.gameObject:SetActive(false)
|
this.itemNum3.gameObject:SetActive(false)
|
||||||
this.itemIcon3.gameObject:SetActive(false)
|
this.itemIcon3.gameObject:SetActive(false)
|
||||||
this.itemInfo3.text=Language[12399]
|
this.itemInfo3.text=Language[12399]
|
||||||
|
this.tipText.gameObject:SetActive(false)
|
||||||
else
|
else
|
||||||
this.itemNum3.gameObject:SetActive(true)
|
this.itemNum3.gameObject:SetActive(true)
|
||||||
this.itemIcon3.gameObject:SetActive(true)
|
this.itemIcon3.gameObject:SetActive(true)
|
||||||
|
|
@ -126,6 +127,12 @@ function PokemonSummonOneResultPanel:OnOpen(...)
|
||||||
local currPrivilege = privilegeConfig[3004]
|
local currPrivilege = privilegeConfig[3004]
|
||||||
itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000)
|
itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000)
|
||||||
end
|
end
|
||||||
|
if itemId ==16 then
|
||||||
|
this.tipText.gameObject:SetActive(true)
|
||||||
|
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
|
||||||
|
else
|
||||||
|
this.tipText.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
|
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
|
||||||
this.itemNum3.text= "x"..itemNum
|
this.itemNum3.text= "x"..itemNum
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ function PokemonSummonTenResultPanel:InitComponent()
|
||||||
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
|
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
|
||||||
this.content2=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content2")
|
this.content2=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content2")
|
||||||
this.itemIcon2=Util.GetGameObject(this.content2,"Icon"):GetComponent("Image")
|
this.itemIcon2=Util.GetGameObject(this.content2,"Icon"):GetComponent("Image")
|
||||||
|
this.tipText=Util.GetGameObject(this.openTenAgainButton, "Text"):GetComponent("Text")
|
||||||
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
|
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
|
||||||
for i = 1, 10 do
|
for i = 1, 10 do
|
||||||
this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent")
|
this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent")
|
||||||
|
|
@ -147,7 +148,12 @@ function PokemonSummonTenResultPanel:OnOpen(...)
|
||||||
id=tenConfig.TenTimesMustGetItem[1][1]
|
id=tenConfig.TenTimesMustGetItem[1][1]
|
||||||
num=tenConfig.TenTimesMustGetItem[1][2]
|
num=tenConfig.TenTimesMustGetItem[1][2]
|
||||||
end
|
end
|
||||||
|
if itemId ==16 then
|
||||||
|
this.tipText.gameObject:SetActive(true)
|
||||||
|
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
|
||||||
|
else
|
||||||
|
this.tipText.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
for key, value in pairs(itemDataList) do
|
for key, value in pairs(itemDataList) do
|
||||||
if ishave==false and value.sId==id and value.num==num then
|
if ishave==false and value.sId==id and value.num==num then
|
||||||
table.removebyvalue(itemDataList,value)
|
table.removebyvalue(itemDataList,value)
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,11 @@ function GiftView:RefreshGiftData()
|
||||||
end
|
end
|
||||||
table.sort(shopData,function(a,b)
|
table.sort(shopData,function(a,b)
|
||||||
if a.sortId == b.sortId then
|
if a.sortId == b.sortId then
|
||||||
return a.DataType > b.DataType
|
if a.DataType == b.DataType and a.DataType == DataType.Direct and b.DataType == DataType.Direct then
|
||||||
|
return rechargeCommodityConfig[a.data.goodsId].Sequence < rechargeCommodityConfig[b.data.goodsId].Sequence
|
||||||
|
else
|
||||||
|
return a.DataType > b.DataType
|
||||||
|
end
|
||||||
else
|
else
|
||||||
return a.sortId > b.sortId
|
return a.sortId > b.sortId
|
||||||
end
|
end
|
||||||
|
|
@ -438,7 +442,9 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
|
||||||
tipImage:SetActive(isPrivilegeGift)
|
tipImage:SetActive(isPrivilegeGift)
|
||||||
if isPrivilegeGift then
|
if isPrivilegeGift then
|
||||||
if shopItemData.DailyUpdate == 7 then
|
if shopItemData.DailyUpdate == 7 then
|
||||||
tipImageText.text = Language[11747]
|
tipImageText.text = Language[11747]
|
||||||
|
elseif shopItemData.DailyUpdate == 15 then
|
||||||
|
tipImageText.text = "15日限购"
|
||||||
elseif shopItemData.DailyUpdate == 30 then
|
elseif shopItemData.DailyUpdate == 30 then
|
||||||
tipImageText.text = Language[11452]
|
tipImageText.text = Language[11452]
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -288,15 +288,15 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
|
||||||
end
|
end
|
||||||
local starGrid = Util.GetGameObject(_go.transform, "star")
|
local starGrid = Util.GetGameObject(_go.transform, "star")
|
||||||
SetHeroStars(starGrid, heroData.star,1,Vector2.New(32.5,32.5),-15)
|
SetHeroStars(starGrid, heroData.star,1,Vector2.New(32.5,32.5),-15)
|
||||||
local choosed =Util.GetGameObject(_go.transform, "choosed")
|
local choosed =Util.GetGameObject(_go.transform, "choosed")
|
||||||
if heroData.ischip then
|
if heroData.ischip==1 then
|
||||||
choosed:SetActive(selectChipId==heroData.dynamicId)
|
choosed:SetActive(selectChipId==heroData.dynamicId)
|
||||||
else
|
else
|
||||||
choosed:SetActive(selectHeroData[heroData.dynamicId] ~= nil)
|
choosed:SetActive(selectHeroData[heroData.dynamicId] ~= nil)
|
||||||
end
|
end
|
||||||
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
|
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
|
||||||
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
|
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
|
||||||
Util.AddOnceClick(cardclickBtn, function()
|
Util.AddOnceClick(cardclickBtn,function()
|
||||||
--如果点击的是碎片
|
--如果点击的是碎片
|
||||||
if heroData.ischip==1 then
|
if heroData.ischip==1 then
|
||||||
--第一个选中的碎片
|
--第一个选中的碎片
|
||||||
|
|
@ -350,7 +350,9 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
selectHeroData[heroData.dynamicId]=heroData
|
||||||
|
choosed:SetActive(true)
|
||||||
|
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
|
||||||
--如果选中灵兽的数量为最大
|
--如果选中灵兽的数量为最大
|
||||||
if LengthOfTable(selectHeroData)==maxSelectNum then
|
if LengthOfTable(selectHeroData)==maxSelectNum then
|
||||||
PopupTipPanel.ShowTip(string.format(Language[12396],maxSelectNum))
|
PopupTipPanel.ShowTip(string.format(Language[12396],maxSelectNum))
|
||||||
|
|
@ -364,11 +366,8 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
|
||||||
this.selectText.gameObject:SetActive(true)
|
this.selectText.gameObject:SetActive(true)
|
||||||
this.chipObj:SetActive(false)
|
this.chipObj:SetActive(false)
|
||||||
isPokemon = true
|
isPokemon = true
|
||||||
end
|
end
|
||||||
choosed:SetActive(true)
|
|
||||||
selectHeroData[heroData.dynamicId]=heroData
|
|
||||||
|
|
||||||
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
|
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@ local _ShowPlusType = {
|
||||||
UpViewRechargeType.XianLingCao,
|
UpViewRechargeType.XianLingCao,
|
||||||
UpViewRechargeType.PuTiZi,
|
UpViewRechargeType.PuTiZi,
|
||||||
UpViewRechargeType.YHMF,
|
UpViewRechargeType.YHMF,
|
||||||
|
UpViewRechargeType.QuLingBi,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 判断是否显示加号
|
-- 判断是否显示加号
|
||||||
|
|
@ -351,7 +352,8 @@ function UpView:RechargeType(_type)
|
||||||
_type==UpViewRechargeType.PuTiZi or
|
_type==UpViewRechargeType.PuTiZi or
|
||||||
_type==UpViewRechargeType.XianLingCao or
|
_type==UpViewRechargeType.XianLingCao or
|
||||||
_type==UpViewRechargeType.YHMF or
|
_type==UpViewRechargeType.YHMF or
|
||||||
_type==UpViewRechargeType.EndlessCoin
|
_type==UpViewRechargeType.EndlessCoin or
|
||||||
|
_type==UpViewRechargeType.QuLingBi
|
||||||
then
|
then
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue