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

dev_chengFeng
ZhangBiao 2021-11-22 12:11:41 +08:00
commit cb80384f02
19 changed files with 1736 additions and 251 deletions

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 2, z: 0, w: 2}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

View File

@ -472,6 +472,7 @@ RectTransform:
- {fileID: 3941206977723881537}
- {fileID: 8715989115649508653}
- {fileID: 677243167307156643}
- {fileID: 3376732376669459976}
m_Father: {fileID: 224457215098483846}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -498,7 +499,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: -28.54
m_Spacing: -35.54
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -3622,7 +3623,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 928.65, y: -82}
m_AnchoredPosition: {x: 984.80005, y: -82}
m_SizeDelta: {x: 205, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5858770910401139525
@ -8887,7 +8888,7 @@ ParticleSystem:
--- !u!199 &8784777500139318308
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14427,7 +14428,7 @@ ParticleSystem:
--- !u!199 &6409678742855279415
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19813,7 +19814,7 @@ ParticleSystem:
--- !u!199 &8594092854800795284
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24590,7 +24591,7 @@ ParticleSystem:
--- !u!199 &5592400397920860441
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24686,7 +24687,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 533.92, y: -84.5}
m_AnchoredPosition: {x: 455.41998, y: -82}
m_SizeDelta: {x: 205, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4817013553506172316
@ -24916,6 +24917,125 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4259736774830821166
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3376732376669459976}
- component: {fileID: 7077975304245803679}
- component: {fileID: 1196141978088114439}
- component: {fileID: 1891585921878792330}
m_Layer: 5
m_Name: Btn8
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3376732376669459976
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4259736774830821166}
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:
- {fileID: 6581519065878786064}
- {fileID: 6687494997412960270}
m_Father: {fileID: 396553229042369325}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 205, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7077975304245803679
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4259736774830821166}
m_CullTransparentMesh: 0
--- !u!114 &1196141978088114439
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4259736774830821166}
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: dcab34f84847d94448b245ab7e62e44e, 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!114 &1891585921878792330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4259736774830821166}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1196141978088114439}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &4355599060562273704
GameObject:
m_ObjectHideFlags: 0
@ -30160,7 +30280,7 @@ ParticleSystem:
--- !u!199 &9197002972510611031
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30855,6 +30975,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5505991415698383330
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6687494997412960270}
- component: {fileID: 3124524889012239405}
- component: {fileID: 3395389926373729507}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6687494997412960270
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505991415698383330}
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: 3376732376669459976}
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: 61.6, y: 36.000023}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3124524889012239405
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505991415698383330}
m_CullTransparentMesh: 0
--- !u!114 &3395389926373729507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505991415698383330}
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 &5865364227022989881
GameObject:
m_ObjectHideFlags: 0
@ -35427,7 +35621,7 @@ ParticleSystem:
--- !u!199 &567135833995928965
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37668,6 +37862,102 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7715841996007713086
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6581519065878786064}
- component: {fileID: 2170586049328480038}
- component: {fileID: 1233620203858029513}
- component: {fileID: 8326411295063234285}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6581519065878786064
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715841996007713086}
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: 3376732376669459976}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 160, y: 86.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2170586049328480038
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715841996007713086}
m_CullTransparentMesh: 0
--- !u!114 &1233620203858029513
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715841996007713086}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1573420865, 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!114 &8326411295063234285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715841996007713086}
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.65882355, g: 0.65882355, b: 0.654902, 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: 48
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 52
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u805A\u7075"
LanguageIndex: 10142
--- !u!1 &7735379766094235568
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e5376e1b18fb5f641ad48187404c2708
guid: c5af600d75c170d4082c222c2c5e3d29
PrefabImporter:
externalObjects: {}
userData:

View File

@ -47440,7 +47440,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -0.000007744202, y: 50}
m_AnchoredPosition: {x: -0.0000022442177, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -81391,8 +81391,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 0.00000011920929, y: 0.74999994}
m_SizeDelta: {x: -8, y: -6.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5820556875347599956
CanvasRenderer:

View File

@ -724,9 +724,9 @@ 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: 0, y: 114.75006}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 178.9, y: 114.75006}
m_SizeDelta: {x: 308.4, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &5086809663402702269
MonoBehaviour:
m_ObjectHideFlags: 0
@ -745,10 +745,10 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 11.8
m_ChildForceExpandWidth: 0
m_Spacing: 10
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!114 &5086809663402702270
MonoBehaviour:
@ -762,8 +762,87 @@ MonoBehaviour:
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &940596303370961447
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7935805716329333929}
- component: {fileID: 4063429400546293587}
- component: {fileID: 2744945179334946622}
m_Layer: 5
m_Name: pro
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7935805716329333929
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 940596303370961447}
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: 1345622732181280237}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.74997, y: -127}
m_SizeDelta: {x: 308.4, y: 35}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &4063429400546293587
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 940596303370961447}
m_CullTransparentMesh: 0
--- !u!114 &2744945179334946622
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 940596303370961447}
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.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!1 &945728811091597308
GameObject:
m_ObjectHideFlags: 0
@ -5698,6 +5777,7 @@ GameObject:
- component: {fileID: 6806311222125822462}
- component: {fileID: 6712636463915347790}
- component: {fileID: 8823004528143727134}
- component: {fileID: 2957038280454176012}
m_Layer: 5
m_Name: skillLayout
m_TagString: Untagged
@ -5717,7 +5797,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4691906652601479550}
- {fileID: 2514627608787250055}
- {fileID: 3176671448659083030}
- {fileID: 8469090483397192595}
m_Father: {fileID: 3847735914630897183}
m_RootOrder: 9
@ -5755,6 +5835,48 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!114 &2957038280454176012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1608170644583938805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8823004528143727134}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &2254615227032153688
GameObject:
m_ObjectHideFlags: 0
@ -5918,100 +6040,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2378711152285979126
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2717758793960761777}
- component: {fileID: 9008547840016297840}
- component: {fileID: 7221800882815018164}
- component: {fileID: 2233768062626440142}
m_Layer: 5
m_Name: pro
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2717758793960761777
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2378711152285979126}
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: 1345622732181280237}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50.1, y: -127}
m_SizeDelta: {x: 293, y: 35}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &9008547840016297840
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2378711152285979126}
m_CullTransparentMesh: 0
--- !u!114 &7221800882815018164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2378711152285979126}
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.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u653B\u51FB\uFF1A1000\uFF08+500\uFF09"
--- !u!114 &2233768062626440142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2378711152285979126}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2385795265252942905
GameObject:
m_ObjectHideFlags: 0
@ -6243,100 +6271,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2495055151291717043
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2514627608787250055}
- component: {fileID: 1666281028079280985}
- component: {fileID: 5353000748583849036}
- component: {fileID: 3190225080716227508}
m_Layer: 5
m_Name: pro
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2514627608787250055
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2495055151291717043}
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: 6806311222125822462}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -146.4, y: -142}
m_SizeDelta: {x: 911, y: 35}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1666281028079280985
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2495055151291717043}
m_CullTransparentMesh: 0
--- !u!114 &5353000748583849036
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2495055151291717043}
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.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u56DB\u79CD\u6CD5\u5B9D\u4E4B\u9B42\u5168\u90E8\u5230\u8FBE2\u661F"
--- !u!114 &3190225080716227508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2495055151291717043}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &2554574251685162266
GameObject:
m_ObjectHideFlags: 0
@ -6578,7 +6512,7 @@ RectTransform:
m_Children:
- {fileID: 2379808058044478554}
- {fileID: 1718138152215959492}
- {fileID: 2717758793960761777}
- {fileID: 7935805716329333929}
- {fileID: 470257861947977671}
- {fileID: 4083169125156670223}
- {fileID: 653018620393097303}
@ -22926,7 +22860,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000022888, y: 275.1}
m_SizeDelta: {x: 321, y: 40}
m_SizeDelta: {x: 377, y: 63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1552852807439129411
CanvasRenderer:
@ -28990,9 +28924,9 @@ 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.000015258789, y: -0.0000129058335}
m_AnchoredPosition: {x: 0, y: 0.000009017457}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
m_Pivot: {x: 0, y: 1}
--- !u!114 &6617612647759148344
MonoBehaviour:
m_ObjectHideFlags: 0
@ -29006,13 +28940,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 40
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 20.7
m_ChildForceExpandWidth: 0
m_Spacing: 28.6
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
@ -29028,7 +28962,7 @@ MonoBehaviour:
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &8628893935515399361
GameObject:
@ -33755,6 +33689,85 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8984460172183604256
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3176671448659083030}
- component: {fileID: 1472241134160624163}
- component: {fileID: 7180357180156463138}
m_Layer: 5
m_Name: pro
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3176671448659083030
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8984460172183604256}
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: 6806311222125822462}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -173.63}
m_SizeDelta: {x: 991.4, y: 259}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1472241134160624163
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8984460172183604256}
m_CullTransparentMesh: 0
--- !u!114 &7180357180156463138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8984460172183604256}
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.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!1 &9030145728978423027
GameObject:
m_ObjectHideFlags: 0

View File

@ -1572,8 +1572,8 @@ FUNCTION_OPEN_TYPE = {
PLAYER_SKILL = 115, --主角技能
shenhun = 116,
WEEK_CARD = 117, -- 周卡
TailsmanSoul = 119,
LINGMAIMIJING = 118,--灵脉秘境
TailsmanSoul = 119,
}
TaskGetBtnIconDef = {
@ -2285,6 +2285,7 @@ GENERAL_POPUP_TYPE={
ShenHunShuXing = 54,
LingMaiRecord = 55,--灵脉秘境纪录
IncarnationDes = 56,
}
--通用信息弹窗类型
@ -2359,6 +2360,7 @@ ItemBaseType = {
--Talisman = 5, --法宝
SoulPrint = 6, --魂印
Materials = 7, --材料
JuLing = 8, --聚灵
}
--探宝类型
TreasureType={

View File

@ -23,7 +23,7 @@ function BagPanel:InitComponent()
this.spLoader = SpriteLoader.New()
this.BtnBack = Util.GetGameObject(self.transform, "rightUp/btnBack")
for i = 1, 7 do
for i = 1, 8 do
tabs1[i] = Util.GetGameObject(self.transform, "box/Btn" .. i)
tabs1RedPoint[i] = Util.GetGameObject(self.transform, "box/Btn" .. i .. "/redPoint")
tabs1[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_xuanze_002")
@ -70,7 +70,7 @@ function BagPanel:BindEvent()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
for i = 1, 7 do
for i = 1, 8 do
Util.AddClick(tabs1[i], function()
--设置tabs的琐碎-----
this.tabs.transform.anchoredPosition = Vector2.New(0,-130)
@ -224,6 +224,9 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni,_tabIndex)
elseif (_index == ItemBaseType.Special) then
itemData = BagManager.GetBagItemDataByItemTypeV2(ItemBaseType.Special,ItemBaseType.Materials,ItemType.HeadFrame)
this:SetItemData(itemData, isTop,isNotAni)
elseif (_index == ItemBaseType.JuLing) then
itemData = BagManager.GetItemDataByItemType(ItemBaseType.JuLing)
this:SetItemData(itemData, isTop,isNotAni)
else
itemData = BagManager.GetBagItemDataByItemType(_index)
this:SetItemData(itemData, isTop,isNotAni)
@ -345,6 +348,8 @@ function this.SingleItemDataShow(_go, _itemData)
end
upHeroInage:SetActive(false)
local frameMask = Util.GetGameObject(_go.transform, "GameObject/item/frameMask")
local frameMaskExp = Util.GetGameObject(_go.transform, "GameObject/item/frameMask/exp")
local frameMaskExpMask = Util.GetGameObject(_go.transform, "GameObject/item/frameMask/mask")
frameMask:SetActive(false)
local num = Util.GetGameObject(_go.gameObject, "GameObject/item/num")
local strongLv=Util.GetGameObject(_go.gameObject, "GameObject/item/lv"):GetComponent("Text")
@ -383,6 +388,14 @@ function this.SingleItemDataShow(_go, _itemData)
elseif _itemData.itemConfig.ItemType == ItemType.Pokemon then
Util.GetGameObject(_go.gameObject, "GameObject/item/frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(YaoHunFrame[_itemData.quality])
num:SetActive(false)
-- 法宝聚灵显示碎片边框
elseif _itemData.itemConfig.ItemType == ItemType.talismanSoulChip then
frameMask:SetActive(true)
frameMaskExp:SetActive(false)
frameMaskExpMask:SetActive(false)
frameMask:GetComponent("Image").sprite = this.spLoader:LoadSprite("f_fabaojuling_zijiemianfabaokuang1")
elseif _itemData.itemConfig.ItemType == ItemType.HeroDebris then
frameMask:SetActive(true)
num:SetActive(false)
@ -390,13 +403,9 @@ function this.SingleItemDataShow(_go, _itemData)
Util.GetGameObject(_go.transform, "GameObject/item/frameMask/exp/Text"):GetComponent("Text").text = BagManager.GetItemCountById(_itemData.itemConfig.Id) .. "/" .. _itemData.itemConfig.UsePerCount
local curExpVal = BagManager.GetItemCountById(_itemData.itemConfig.Id) / _itemData.itemConfig.UsePerCount
local expValue = curExpVal >= 1 and 1 or curExpVal
Util.GetGameObject(_go.transform, "GameObject/item/frameMask/exp"):GetComponent("Slider").value = expValue
local expMask = Util.GetGameObject(_go.transform, "GameObject/item/frameMask/mask")
if expValue >= 1 then
expMask:SetActive(true)
else
expMask:SetActive(false)
end
frameMaskExp:SetActive(true)
frameMaskExp:GetComponent("Slider").value = expValue
frameMaskExpMask:SetActive(expValue >= 1)
local propertyName = itemConfig[_itemData.itemConfig.Id].PropertyName
if (propertyName ~= 0) then
fragmentIcon.gameObject:SetActive(true)
@ -628,6 +637,10 @@ function this.SetBottomBarIsActive()
local num = string.split(string,"#")[1]
tabs1[i]:SetActive(PlayerManager.level >= tonumber(num))
end
--为聚灵定开启规则
if i == 8 then
tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
end
end
end

View File

@ -2026,9 +2026,13 @@ local passivityList = {
if not type then
type=0
end
local function onRoleDamageAfter(target)
target.isFlagCrit = false
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
local curRound=BattleLogic.GetCurRound()
if curRound>i1 then
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
end
end
role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role)
local function onRoleDamageBefore(critFunc,atkRole,defRole,skill)
@ -2041,11 +2045,11 @@ local passivityList = {
if skill and not skill.isTriggerJudge and judge==1 then
return
end
local curRound=BattleLogic.GetCurRound()
if (curRound== i1 and type==0) or (curRound<=i1 and type==1) then
defRole.isFlagCrit = true
else
defRole.isFlagCrit=false
end
end
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role)
@ -5668,8 +5672,8 @@ local passivityList = {
return
end
if (f1==12 or f1==13) and p1 and p2 and p1~=0 and p2~=0 then
local levelDamage = floor(defRole:GetRoleData(RoleDataName.MaxHp)*p1)
local lostDamage = defRole:GetRoleData(RoleDataName.MaxHp) - defRole:GetRoleData(RoleDataName.Hp)
local levelDamage = floor(role:GetRoleData(RoleDataName.MaxHp)*p1)
local lostDamage = role:GetRoleData(RoleDataName.MaxHp) - role:GetRoleData(RoleDataName.Hp)
local level = floor(lostDamage/levelDamage)
dt=dt+(level*p2)
end

View File

@ -107,7 +107,8 @@ function BattleLogic.GetIsPvP()
BattleLogic.Type== BATTLE_SERVER_TYPE.ArenaFight or
BattleLogic.Type== BATTLE_SERVER_TYPE.CarPersonFight or
BattleLogic.Type== BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight or
BattleLogic.Type== BATTLE_SERVER_TYPE.NewArenaFight then
BattleLogic.Type== BATTLE_SERVER_TYPE.NewArenaFight or
BattleLogic.Type== BATTLE_SERVER_TYPE.LINGMAIMIJING then
return true
end
return false

View File

@ -29,6 +29,7 @@ BATTLE_SERVER_TYPE = {
FightLevel = 20,--
QiJieShiLian = 23,--七界试炼
CrossYuxuLunDaoFight = 24,--玉虚论道
LINGMAIMIJING = 25, --灵脉秘境
}
BattleEventName = {

View File

@ -314,6 +314,8 @@ function this.On_Btn2_Click()
--检测三个队伍是否有重复英雄
local len = 0
local upHeros={}
local isSame=false
for key, value in pairs(allHeros) do
local newHero={}
newHero.heroId=value.Id
@ -325,13 +327,21 @@ function this.On_Btn2_Click()
elseif value.index==2003 then
table.insert(threeTeam,newHero)
end
if BattleUtil.ChecklistIsContainValue(upHeros,value.Id) then
isSame=true
else
table.insert(upHeros,value.Id)
end
len = len + 1
end
if len <= 0 then
PopupTipPanel.ShowTip(string.format(Language[10699], 1))
return
end
if isSame then
PopupTipPanel.ShowTip("编队中有相同神将")
return
end
table.insert(allTeam,oneTeam)
table.insert(allTeam,twoTeam)
table.insert(allTeam,threeTeam)

View File

@ -37,6 +37,7 @@ local contentScripts = {
[GENERAL_POPUP_TYPE.ShenHunShuXing] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes"), panelName = "GeneralBigPopup_ShenhunDes"},
--灵脉秘境纪录
[GENERAL_POPUP_TYPE.LingMaiRecord] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord"), panelName = "GeneralBigPopup_LingMaiRecord"},
[GENERAL_POPUP_TYPE.IncarnationDes] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes"), panelName = "GeneralBigPopup_IncarnationDes"},
}
--子模块预设
local contentPrefabs={}

View File

@ -0,0 +1,102 @@
----- 神应属性弹窗 -----
local this = {}
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
--传入父脚本模块
local parent
local sortingOrder=0
local attriList = {}
function this:InitComponent(gameObject)
self.bg =Util.GetGameObject(gameObject, "bg")
self.proGroup =Util.GetGameObject(gameObject, "proGroup")
self.proTitle =Util.GetGameObject(gameObject, "title")
self.proTip =Util.GetGameObject(gameObject, "tip")
self.proValue =Util.GetGameObject(gameObject, "pro")
self.proNum =Util.GetGameObject(self.proValue, "name")
self.close =Util.GetGameObject(gameObject, "close")
end
function this:BindEvent()
Util.AddClick(self.close,function()
parent:ClosePanel()
end)
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent,_Data)
parent=_parent
sortingOrder = _parent.sortingOrder
parent.BG:SetActive(false)
local args = _Data
local data = args[1]
for i = 1, #data do
if not attriList[i] then
attriList[i] = {}
attriList[i].proGroup = newObjToParent(self.proGroup,self.bg)
end
attriList[i].proGroup.gameObject:SetActive(false)
if not attriList[i].title then
attriList[i].title = newObjToParent(self.proTitle,attriList[i].proGroup)
attriList[i].titleCom = Util.GetGameObject(attriList[i].title,"name/text"):GetComponent("Text")
end
attriList[i].title.gameObject:SetActive(false)
for j = 1, #data[i].pro do
if not attriList[i].pro then
attriList[i].pro = {}
end
if not attriList[i].TextCom then
attriList[i].TextCom = {}
end
if not attriList[i].proParent then
attriList[i].proParent = newObjToParent(self.proValue,attriList[i].proGroup)
end
if not attriList[i].pro[j] then
attriList[i].pro[j] = newObjToParent(self.proNum,attriList[i].proParent)
attriList[i].TextCom[j] = attriList[i].pro[j]:GetComponent("Text")
end
attriList[i].pro[j].gameObject:SetActive(false)
end
if not attriList[i].tip then
attriList[i].tip = newObjToParent(self.proTip,attriList[i].proGroup)
attriList[i].tipComp = Util.GetGameObject(attriList[i].tip,"name"):GetComponent("Text")
end
attriList[i].proGroup.gameObject:SetActive(false)
end
for i = 1, #data do
attriList[i].proGroup.gameObject:SetActive(true)
if data[i].title and data[i].title ~= "" then
attriList[i].title.gameObject:SetActive(true)
attriList[i].titleCom.text = data[i].title
else
attriList[i].title.gameObject:SetActive(false)
end
for j = 1, #data[i].pro do
attriList[i].pro[j].gameObject:SetActive(true)
attriList[i].TextCom[j].text = data[i].pro[j]
end
if data[i].tip and data[i].tip ~= "" then
attriList[i].tip.gameObject:SetActive(true)
attriList[i].tipComp.text = data[i].tip
else
attriList[i].tip.gameObject:SetActive(false)
end
end
end
function this:OnClose()
Util.ClearChild(self.bg.transform)
attriList = {}
end
function this:OnDestroy()
Util.ClearChild(self.bg.transform)
attriList = {}
end
return this

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1100773d0ff494742a31abf18f633d7b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,6 @@
require("Base/BasePanel")
TailsManSouPanel = Inherit(BasePanel)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local this = TailsManSouPanel
local redPointList = {}
-- Tab管理器
@ -49,7 +50,38 @@ function TailsManSouPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.addBtn, function()
UIManager.OpenPanel(UIName.RoleProInfoPopup,TailsManSoulManager.GetTailsmanTotalPro(),nil,false,nil)
local s = function(data)
local lis1 = {}
for k,v in pairs(data) do
table.insert(lis1,string.format("<color=#00FF00>%s:+%s</color>",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)))
end
return lis1
end
local data = {}
local singData = {}
singData.title = "加成属性"
local li = TailsManSoulManager.GetTailsmanTotalPro()
singData.pro = s(li)
singData.tip = ""
table.insert(data,singData)
-- for i = 1 ,#data do
-- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)
-- for k,v in ipairs(data[i].pro) do
-- LogGreen("data[i]:"..v)
-- end
-- end
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.IncarnationDes,data)
-- local li = TailsManSoulManager.GetTailsmanTotalPro()
-- local li2 = {}
-- for k,v in pairs(li) do
-- if propertyConfig[k].Style == 1 then
-- li2[k] = v
-- elseif propertyConfig[k].Style == 2 then
-- li2[k] = v/100
-- end
-- end
-- UIManager.OpenPanel(UIName.RoleProInfoPopup,li2,nil,false,nil)
end)
self.tabBox = TabBox.New()
self.tabBox:SetTabAdapter(self.SetTabAdapter)

View File

@ -48,7 +48,7 @@ function this.GetTailsmanSoulDataById(id)
if not skillList[trumpBook[id].SkillList[i][1]] then
skillList[trumpBook[id].SkillList[i][1]] = ""
end
skillList[trumpBook[id].SkillList[i][1]] = string.format("四种法宝之全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]]))
skillList[trumpBook[id].SkillList[i][1]] = string.format("四种法宝之全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]]))
end
return trumpList,maxLv,lv,skillList
end

View File

@ -101,9 +101,16 @@ local function OnEndDrag(self, Pointgo, data)
self.curFormation[2000 + currIndex] = self.curFormation[2000 + targetIndex]
self.curFormation[2000 + targetIndex] = tempFormation
-- 保存
local upHeros={}
for i = 1, 3 do
local heros = {}
for _, hero in ipairs(self.curFormation[i+2000].teamHeroInfos) do
if BattleUtil.ChecklistIsContainValue(upHeros,hero.heroId) then
PopupTipPanel.ShowTip("编队中有相同神将!!")
return
else
table.insert(upHeros,hero.heroId)
end
table.insert(heros, {heroId = hero.heroId, position = hero.position})
end
FormationManager.SaveFormation(i+2000, heros,

View File

@ -247,19 +247,29 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
UIManager.OpenPanel(UIName.SoulPrintPopUp, ShowType.showTip3, nil,_itemData.backData.itemId)
end)
elseif _itemData.configData.ItemType == ItemType.heroDogFood then --狗粮
--狗粮
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
end)
self.heroShowGo:SetActive(true)
local propertyName=itemConfig[_itemData.backData.itemId].PropertyName
if(propertyName~=0) then
self.fragmentIcon:SetActive(true)
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
end
self.starGrid:SetActive(true)
local star = _itemData.configData.HeroStar[1]
SetHeroStars(self.spLoader,self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
--狗粮
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
end)
self.heroShowGo:SetActive(true)
local propertyName=itemConfig[_itemData.backData.itemId].PropertyName
if(propertyName~=0) then
self.fragmentIcon:SetActive(true)
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
end
self.starGrid:SetActive(true)
local star = _itemData.configData.HeroStar[1]
SetHeroStars(self.spLoader,self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
elseif _itemData.configData.ItemType == ItemType.talismanSoulChip then
self.num:SetActive(false)
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.backData.itemId].Quantity))
self.frameMask:SetActive(true)
self.frameMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("f_fabaojuling_zijiemianfabaokuang1")
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[_itemData.backData.itemId].ResourceID))
self.starGrid:SetActive(false)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,_itemData.backData.itemId,nil,self.isRewardItemPop,true)
end)
else
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
@ -579,7 +589,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
self.starGrid:SetActive(false)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,true)
end)
elseif itemDataConFig.ItemType == ItemType.HunYin then
-- self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7)