[功能]================神系英雄添加提叫

dev_chengFeng
wangzhenxing 2022-03-28 18:18:19 +08:00
parent 91ace072a2
commit a13dd2939a
89 changed files with 7412 additions and 978 deletions

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7f63649dc59c80540864c0959b19de8a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -644,7 +644,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7578276957751805400
RectTransform:
m_ObjectHideFlags: 0
@ -660,10 +660,10 @@ RectTransform:
m_Father: {fileID: 455258775517793228}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 637.895, y: -50}
m_SizeDelta: {x: 88, y: 88}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6222752125009362386
CanvasRenderer:
@ -5241,7 +5241,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.8, y: 0}
m_AnchoredPosition: {x: 0.8, y: -4}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3202560027862180218
@ -5272,7 +5272,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 63cef17c3768e3644bb4d2edd67b010e, type: 3}
m_Sprite: {fileID: 21300000, guid: 47ce9b27346f39f45b705e95eb3984a7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -11278,7 +11278,7 @@ MonoBehaviour:
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 88, y: 88}
m_CellSize: {x: 60, y: 88}
m_Spacing: {x: 80, y: 0}
m_Constraint: 0
m_ConstraintCount: 2

View File

@ -165,7 +165,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000030517578, y: -153.6}
m_AnchoredPosition: {x: 0, y: -153.59998}
m_SizeDelta: {x: -62, y: -858.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &618128080
@ -5414,7 +5414,7 @@ ParticleSystem:
--- !u!199 &7243255838117026635
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -12221,7 +12221,7 @@ ParticleSystem:
--- !u!199 &8697864822700251553
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -12790,6 +12790,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5676106473523483352
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7521040817890529094}
- component: {fileID: 8184714508184027587}
- component: {fileID: 8652856510550430045}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7521040817890529094
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5676106473523483352}
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: 1679377544966496960}
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: 0, y: 0}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8184714508184027587
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5676106473523483352}
m_CullTransparentMesh: 0
--- !u!114 &8652856510550430045
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5676106473523483352}
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: 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_Sprite: {fileID: 21300000, guid: b1894c27fafe6d54fa31df687a95eca9, 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 &5863056040949832250
GameObject:
m_ObjectHideFlags: 0
@ -13175,7 +13249,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_TargetGraphic: {fileID: 6364469521312437198}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -13851,6 +13925,124 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &7483241604376772297
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1679377544966496960}
- component: {fileID: 1300062895073468334}
- component: {fileID: 4857424722155903043}
- component: {fileID: 5440842832761315083}
m_Layer: 5
m_Name: Btn5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1679377544966496960
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483241604376772297}
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: 7521040817890529094}
m_Father: {fileID: 4601454044937592335}
m_RootOrder: 5
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1300062895073468334
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483241604376772297}
m_CullTransparentMesh: 0
--- !u!114 &4857424722155903043
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483241604376772297}
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: 0}
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: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5440842832761315083
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483241604376772297}
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: 4857424722155903043}
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 &7690592147201211663
GameObject:
m_ObjectHideFlags: 0
@ -13884,6 +14076,7 @@ RectTransform:
- {fileID: 3748499635311271517}
- {fileID: 6932585772116359307}
- {fileID: 5697360927008465263}
- {fileID: 1679377544966496960}
m_Father: {fileID: 3913938536738076481}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -13913,7 +14106,7 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 88, y: 88}
m_Spacing: {x: 80, y: 0}
m_Spacing: {x: 60, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &7883796241485849885
@ -19038,7 +19231,7 @@ ParticleSystem:
--- !u!199 &419226832923600345
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -149,6 +149,197 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &781079715
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 781079716}
- component: {fileID: 781079718}
- component: {fileID: 781079717}
m_Layer: 5
m_Name: di (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &781079716
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781079715}
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: 224617098218550000}
m_RootOrder: 7
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: 0}
m_SizeDelta: {x: 1296, y: 2304}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &781079718
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781079715}
m_CullTransparentMesh: 0
--- !u!114 &781079717
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781079715}
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: 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_Sprite: {fileID: 21300000, guid: ebe3fcbf206dfdb4591ae523498366cc, 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 &1751225690
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1751225691}
- component: {fileID: 1751225694}
- component: {fileID: 1751225693}
- component: {fileID: 1751225692}
m_Layer: 5
m_Name: changeBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1751225691
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1751225690}
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: 4445170960054642985}
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: 30, y: 26.3}
m_SizeDelta: {x: 45, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1751225694
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1751225690}
m_CullTransparentMesh: 0
--- !u!114 &1751225693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1751225690}
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: 1af0be1ab6df5204f8a703a213002f4c, 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 &1751225692
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1751225690}
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: 1751225693}
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 &1019573402812850
GameObject:
m_ObjectHideFlags: 0
@ -29651,7 +29842,7 @@ 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_AnchoredPosition: {x: 241.52, y: 0}
m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222314792653266900
@ -49059,6 +49250,7 @@ RectTransform:
- {fileID: 6357699743469133132}
- {fileID: 5880825099681610330}
- {fileID: 6989157810520256680}
- {fileID: 781079716}
- {fileID: 6814163031984455861}
m_Father: {fileID: 224287801546099592}
m_RootOrder: 0
@ -55974,7 +56166,8 @@ RectTransform:
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_Children:
- {fileID: 1751225691}
m_Father: {fileID: 8357676685865063738}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -56756,7 +56949,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224617098218550000}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}

View File

@ -1928,7 +1928,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &224052796092394162
RectTransform:
m_ObjectHideFlags: 0
@ -1944,10 +1944,10 @@ RectTransform:
m_Father: {fileID: 1694939856711927259}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 637.895, y: -50}
m_SizeDelta: {x: 88, y: 88}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222429175765422430
CanvasRenderer:
@ -2673,7 +2673,7 @@ MonoBehaviour:
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 88, y: 88}
m_CellSize: {x: 55, y: 88}
m_Spacing: {x: 80, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
@ -3062,7 +3062,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -4}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7284288985413654709

View File

@ -1658,7 +1658,7 @@ FUNCTION_OPEN_TYPE = {
DAILYCHALLENGE_HERODEBRIS=69,--每日角色碎片副本
DAILYCHALLENGE_TALISMAN=70,--每日法宝副本
DAILYCHALLENGE_SOULPRINT=71,--每日魂印副本
CARDELAY = 73,
CARDELAY = 73,--车迟斗法
PEOPLE_MIRROR=74,--轩辕宝镜
COMPOUND_HERO=78,--神将合成、置换
POKEMON=79,--灵兽山
@ -2394,6 +2394,7 @@ GENERAL_POPUP_TYPE={
GemMoreCom = 61, --命石批量合成
HomeLandEquip = 65,--家园装备升级
ChangeHeroPro = 66,--改变英雄阵营
ChangeHeroProConfirm = 67,--改变英雄阵营确认界面
--大号通用弹窗
YiJingBaoKu = 30,--易经宝库
@ -2506,6 +2507,13 @@ RecruitType = {
tiandihonglu = 52, --天地洪炉
}
CostConfirmType = {
ChangeHeroPro = 1,--改变英雄职业
}
ItemBaseType = {
Special = 1, --特殊
HeroChip = 2, --碎片
@ -3116,6 +3124,7 @@ PropertyType = {
[2] = "佛系",
[3] = "妖系",
[4] = "道系",
[5] = "神系",
}
ProfessionType = {

View File

@ -1449,9 +1449,9 @@ function GetProStrImageByProNum(_index)
elseif _index == 4 then
return "r_hero_dadi 1_zh"
elseif _index == 5 then
return "r_hero_dadi 1_zh"
return "z_icon_qingjinbao"
elseif _index == 6 then
return "r_hero_dadi 1_zh"
return "z_icon_qingjinbao"
else
return "z_icon_01_zh"
end
@ -1591,6 +1591,9 @@ function GetTimeStamp()
return PlayerManager.serverTime
end
--- 获取当前时间到下一个n点的时间长度
--- 获取当前时间到一天中某时的剩余时间24小时制
function CalculateSecondsNowTo_N_OClock(n)

View File

@ -453,6 +453,7 @@ UIName = {
HeroPreviewNewPanel = 460,--抽卡奖池预览
PowerRicePanel = 462,--战力冲刺界面
EastSeaFindGodPanel = 463,--东海寻仙
ChangeHeroProConfirmWindow = 464,--改变职业确认
}
SubUIConfig = {

View File

@ -105,6 +105,7 @@ FIGHTUNITINFO_REALID_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_FORCESCORE_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_PLAYERSEX_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO = protobuf.Descriptor();
FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_POKEMONUNITLIST_FIELD = protobuf.FieldDescriptor();
@ -506,6 +507,7 @@ TEAMSIMPLEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_POSITION_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_SKINID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO = protobuf.Descriptor();
TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -862,6 +864,7 @@ EQUIPINTENSIFYINFO_LVID_FIELD = protobuf.FieldDescriptor();
COMMKEYVAL = protobuf.Descriptor();
COMMKEYVAL_KEY_FIELD = protobuf.FieldDescriptor();
COMMKEYVAL_VAL_FIELD = protobuf.FieldDescriptor();
COMMKEYVAL_VAL2_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPINFO = protobuf.Descriptor();
EXPLORERMAPINFO_TEAMID_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPINFO_MAPID_FIELD = protobuf.FieldDescriptor();
@ -1854,11 +1857,21 @@ FIGHTUNITINFO_GODSOULLV_FIELD.default_value = 0
FIGHTUNITINFO_GODSOULLV_FIELD.type = 5
FIGHTUNITINFO_GODSOULLV_FIELD.cpp_type = 1
FIGHTUNITINFO_PROPERTYID_FIELD.name = "propertyId"
FIGHTUNITINFO_PROPERTYID_FIELD.full_name = ".rpc.protocols.FightUnitInfo.propertyId"
FIGHTUNITINFO_PROPERTYID_FIELD.number = 11
FIGHTUNITINFO_PROPERTYID_FIELD.index = 10
FIGHTUNITINFO_PROPERTYID_FIELD.label = 1
FIGHTUNITINFO_PROPERTYID_FIELD.has_default_value = false
FIGHTUNITINFO_PROPERTYID_FIELD.default_value = 0
FIGHTUNITINFO_PROPERTYID_FIELD.type = 5
FIGHTUNITINFO_PROPERTYID_FIELD.cpp_type = 1
FIGHTUNITINFO.name = "FightUnitInfo"
FIGHTUNITINFO.full_name = ".rpc.protocols.FightUnitInfo"
FIGHTUNITINFO.nested_types = {}
FIGHTUNITINFO.enum_types = {}
FIGHTUNITINFO.fields = {FIGHTUNITINFO_UNITID_FIELD, FIGHTUNITINFO_UNITSKILLIDS_FIELD, FIGHTUNITINFO_PROPERTY_FIELD, FIGHTUNITINFO_POSITION_FIELD, FIGHTUNITINFO_STAR_FIELD, FIGHTUNITINFO_SKINID_FIELD, FIGHTUNITINFO_REALID_FIELD, FIGHTUNITINFO_FORCESCORE_FIELD, FIGHTUNITINFO_PLAYERSEX_FIELD, FIGHTUNITINFO_GODSOULLV_FIELD}
FIGHTUNITINFO.fields = {FIGHTUNITINFO_UNITID_FIELD, FIGHTUNITINFO_UNITSKILLIDS_FIELD, FIGHTUNITINFO_PROPERTY_FIELD, FIGHTUNITINFO_POSITION_FIELD, FIGHTUNITINFO_STAR_FIELD, FIGHTUNITINFO_SKINID_FIELD, FIGHTUNITINFO_REALID_FIELD, FIGHTUNITINFO_FORCESCORE_FIELD, FIGHTUNITINFO_PLAYERSEX_FIELD, FIGHTUNITINFO_GODSOULLV_FIELD, FIGHTUNITINFO_PROPERTYID_FIELD}
FIGHTUNITINFO.is_extendable = false
FIGHTUNITINFO.extensions = {}
FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.name = "fightUnitList"
@ -5674,11 +5687,21 @@ TEAMSIMPLEINFO_GODSOULLV_FIELD.default_value = 0
TEAMSIMPLEINFO_GODSOULLV_FIELD.type = 5
TEAMSIMPLEINFO_GODSOULLV_FIELD.cpp_type = 1
TEAMSIMPLEINFO_PROPERTYID_FIELD.name = "propertyId"
TEAMSIMPLEINFO_PROPERTYID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.propertyId"
TEAMSIMPLEINFO_PROPERTYID_FIELD.number = 8
TEAMSIMPLEINFO_PROPERTYID_FIELD.index = 7
TEAMSIMPLEINFO_PROPERTYID_FIELD.label = 1
TEAMSIMPLEINFO_PROPERTYID_FIELD.has_default_value = false
TEAMSIMPLEINFO_PROPERTYID_FIELD.default_value = 0
TEAMSIMPLEINFO_PROPERTYID_FIELD.type = 5
TEAMSIMPLEINFO_PROPERTYID_FIELD.cpp_type = 1
TEAMSIMPLEINFO.name = "TeamSimpleInfo"
TEAMSIMPLEINFO.full_name = ".rpc.protocols.TeamSimpleInfo"
TEAMSIMPLEINFO.nested_types = {}
TEAMSIMPLEINFO.enum_types = {}
TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD}
TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD, TEAMSIMPLEINFO_PROPERTYID_FIELD}
TEAMSIMPLEINFO.is_extendable = false
TEAMSIMPLEINFO.extensions = {}
TEAMONETEAMINFO_TEAM_FIELD.name = "team"
@ -9072,11 +9095,21 @@ COMMKEYVAL_VAL_FIELD.default_value = 0
COMMKEYVAL_VAL_FIELD.type = 5
COMMKEYVAL_VAL_FIELD.cpp_type = 1
COMMKEYVAL_VAL2_FIELD.name = "val2"
COMMKEYVAL_VAL2_FIELD.full_name = ".rpc.protocols.CommKeyVal.val2"
COMMKEYVAL_VAL2_FIELD.number = 3
COMMKEYVAL_VAL2_FIELD.index = 2
COMMKEYVAL_VAL2_FIELD.label = 1
COMMKEYVAL_VAL2_FIELD.has_default_value = false
COMMKEYVAL_VAL2_FIELD.default_value = 0
COMMKEYVAL_VAL2_FIELD.type = 5
COMMKEYVAL_VAL2_FIELD.cpp_type = 1
COMMKEYVAL.name = "CommKeyVal"
COMMKEYVAL.full_name = ".rpc.protocols.CommKeyVal"
COMMKEYVAL.nested_types = {}
COMMKEYVAL.enum_types = {}
COMMKEYVAL.fields = {COMMKEYVAL_KEY_FIELD, COMMKEYVAL_VAL_FIELD}
COMMKEYVAL.fields = {COMMKEYVAL_KEY_FIELD, COMMKEYVAL_VAL_FIELD, COMMKEYVAL_VAL2_FIELD}
COMMKEYVAL.is_extendable = false
COMMKEYVAL.extensions = {}
EXPLORERMAPINFO_TEAMID_FIELD.name = "teamId"

View File

@ -17,6 +17,7 @@ TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
DIFFICULTMAPOPTION = protobuf.Descriptor();
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
@ -367,11 +368,21 @@ TRIALHEROINFO_GODSOULLV_FIELD.default_value = 0
TRIALHEROINFO_GODSOULLV_FIELD.type = 5
TRIALHEROINFO_GODSOULLV_FIELD.cpp_type = 1
TRIALHEROINFO_PROPERTYID_FIELD.name = "propertyId"
TRIALHEROINFO_PROPERTYID_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.propertyId"
TRIALHEROINFO_PROPERTYID_FIELD.number = 9
TRIALHEROINFO_PROPERTYID_FIELD.index = 8
TRIALHEROINFO_PROPERTYID_FIELD.label = 1
TRIALHEROINFO_PROPERTYID_FIELD.has_default_value = false
TRIALHEROINFO_PROPERTYID_FIELD.default_value = 0
TRIALHEROINFO_PROPERTYID_FIELD.type = 5
TRIALHEROINFO_PROPERTYID_FIELD.cpp_type = 1
TRIALHEROINFO.name = "TrialHeroInfo"
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
TRIALHEROINFO.nested_types = {}
TRIALHEROINFO.enum_types = {}
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD, TRIALHEROINFO_GODSOULLV_FIELD}
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD, TRIALHEROINFO_GODSOULLV_FIELD, TRIALHEROINFO_PROPERTYID_FIELD}
TRIALHEROINFO.is_extendable = false
TRIALHEROINFO.extensions = {}
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"

View File

@ -650,6 +650,7 @@ EXPLORERMAPREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPREWARDRESPONSE_EXPLOREINFO_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPINDICATIONRESPONSE = protobuf.Descriptor();
EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPEVENTREQUEST = protobuf.Descriptor();
EXPLORERMAPEVENTREQUEST_ID_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPEVENTRESPONSE = protobuf.Descriptor();
@ -657,6 +658,7 @@ EXPLORERMAPEVENTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPEVENTRESPONSE_FIGHTRESULT_FIELD = protobuf.FieldDescriptor();
EXPLORERMAPEVENTRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST = protobuf.Descriptor();
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD = protobuf.FieldDescriptor();
EXPLORERXMEVENTCHALLENGEBEFORERESPONSE = protobuf.Descriptor();
EXPLORERXMEVENTCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD = protobuf.FieldDescriptor();
HOMEINFOREQUEST = protobuf.Descriptor();
@ -6613,11 +6615,22 @@ EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD.message_type = CommonProto_pb.EX
EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD.type = 11
EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD.cpp_type = 10
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.name = "randEvent"
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.full_name = ".rpc.protocols.ExplorerMapIndicationResponse.randEvent"
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.number = 2
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.index = 1
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.label = 3
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.has_default_value = false
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.default_value = {}
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.message_type = CommonProto_pb.COMMKEYVAL
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.type = 11
EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD.cpp_type = 10
EXPLORERMAPINDICATIONRESPONSE.name = "ExplorerMapIndicationResponse"
EXPLORERMAPINDICATIONRESPONSE.full_name = ".rpc.protocols.ExplorerMapIndicationResponse"
EXPLORERMAPINDICATIONRESPONSE.nested_types = {}
EXPLORERMAPINDICATIONRESPONSE.enum_types = {}
EXPLORERMAPINDICATIONRESPONSE.fields = {EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD}
EXPLORERMAPINDICATIONRESPONSE.fields = {EXPLORERMAPINDICATIONRESPONSE_EXPLOREINFO_FIELD, EXPLORERMAPINDICATIONRESPONSE_RANDEVENT_FIELD}
EXPLORERMAPINDICATIONRESPONSE.is_extendable = false
EXPLORERMAPINDICATIONRESPONSE.extensions = {}
EXPLORERMAPEVENTREQUEST_ID_FIELD.name = "id"
@ -6676,11 +6689,21 @@ EXPLORERMAPEVENTRESPONSE.enum_types = {}
EXPLORERMAPEVENTRESPONSE.fields = {EXPLORERMAPEVENTRESPONSE_FIGHTDATA_FIELD, EXPLORERMAPEVENTRESPONSE_FIGHTRESULT_FIELD, EXPLORERMAPEVENTRESPONSE_DROP_FIELD}
EXPLORERMAPEVENTRESPONSE.is_extendable = false
EXPLORERMAPEVENTRESPONSE.extensions = {}
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.name = "eventId"
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.full_name = ".rpc.protocols.ExplorerXMEventChallengeBeforeRequest.eventId"
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.number = 1
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.index = 0
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.label = 1
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.has_default_value = false
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.default_value = 0
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.type = 5
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD.cpp_type = 1
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.name = "ExplorerXMEventChallengeBeforeRequest"
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.full_name = ".rpc.protocols.ExplorerXMEventChallengeBeforeRequest"
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.nested_types = {}
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.enum_types = {}
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.fields = {}
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.fields = {EXPLORERXMEVENTCHALLENGEBEFOREREQUEST_EVENTID_FIELD}
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.is_extendable = false
EXPLORERXMEVENTCHALLENGEBEFOREREQUEST.extensions = {}
EXPLORERXMEVENTCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.name = "defTeamInfo"

View File

@ -276,7 +276,7 @@ function this.RefreshDefendFormation()
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
this.Demons[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, heroData.star))
this.Demons[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
this.Demons[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
this.Demons[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
end
end

View File

@ -293,7 +293,7 @@ function this.FreshTeam(formation, isBlue)
-- end
SetHeroIcon(this.spLoader, heroData,teamRoot[heroData.position].icon,heroConfig)
SetHeroFlyEffect(teamRoot[heroData.position].hero,this.spLoader,heroData.star,sortLayer,1)
teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.propertyId))
end
end
--根据前端数据显示编队
@ -313,7 +313,7 @@ function this.FreshTeam2(formation, isBlue)
local heroConfig = heroData.heroConfig
teamRoot[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
teamRoot[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
end
end
-- 控制显示编队信息

View File

@ -257,7 +257,7 @@ function this.FreshTeam()
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
this.myBaby[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
this.myBaby[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
this.myBaby[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
this.myBaby[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
SetHeroFlyEffect(this.myBaby[hero.position].hero,this.spLoader,heroData.star,orginLayer+1,0.9)
end
end

View File

@ -335,6 +335,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
local _godSoulLv=tonumber(data.fightUnitList[i].godSoulLv)
local skills = string.split(data.fightUnitList[i].unitSkillIds, "#")
local propertys = string.split(data.fightUnitList[i].property, "#")
local proId= tonumber(data.fightUnitList[i].propertyId)
local role = {
roleId = rid,
position = position,
@ -345,7 +346,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
type = 1,
quality = 0,
job=HeroConfig[rid].Job,
element = HeroConfig[rid].PropertyName,
element = proId,
professionId = HeroConfig[rid].Profession,
passivity = { },
property = { },
@ -420,6 +421,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
local star = tonumber(data2.fightUnitList[j].star)
local skin=tonumber(data2.fightUnitList[j].skinId)
local _godSoulLv=tonumber(data2.fightUnitList[j].godSoulLv)
local proId = tonumber(data2.fightUnitList[j].propertyId)
skills = string.split(data2.fightUnitList[j].unitSkillIds, "#")
propertys = string.split(data2.fightUnitList[j].property, "#")
role = {
@ -433,7 +435,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
camp = 1,
type = monsterConfig.Type,
quality = monsterConfig.Quality,
element = monsterConfig.PropertyName,
element = proId,
ai = monsterConfig.MonsterAi,
professionId = monsterConfig.Profession,
passivity = { },
@ -445,6 +447,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
local star = tonumber(data2.fightUnitList[j].star)
local skin=tonumber(data2.fightUnitList[j].skinId)
local _godSoulLv=tonumber(data2.fightUnitList[j].godSoulLv)
local proId2 = tonumber(data2.fightUnitList[j].propertyId)
skills = string.split(data2.fightUnitList[j].unitSkillIds, "#")
propertys = string.split(data2.fightUnitList[j].property, "#")
-- 如果找不到去怪物里面找
@ -464,7 +467,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
type = 1,
quality = 0,
godSoulLv=_godSoulLv,
element = HeroConfig[rid].PropertyName,
element = proId2,
professionId = HeroConfig[rid].Profession,
passivity = { },
property = { },

View File

@ -420,7 +420,7 @@ function this.HeadAdapter(head,data,type)
-- 属性
proto:SetActive(false)
if config.PropertyName then
protoIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(config.PropertyName))
protoIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(data.roleData.element))
proto:SetActive(true)
end

View File

@ -133,7 +133,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local formationMask = Util.GetGameObject(go.transform, "formationMask")
-- formationMask:SetActive(false)
formationMask:SetActive(false)-- LengthOfTable(heroData.formationList) ~= 0 or heroData.lockState == 1)

View File

@ -157,7 +157,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local formationMask = Util.GetGameObject(go.transform, "formationMask")
-- formationMask:SetActive(false)
formationMask:SetActive( LengthOfTable(heroData.formationList) ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[10410])

View File

@ -189,7 +189,7 @@ function this.GetHeroDataByPosition(_position)
local heros = {}
local index = 1
for i, v in pairs(HeroManager.ByReplaceHeroGetAllHeros()) do
if HeroConfig[v.id].PropertyName == _position or _position == 0 then --0 全职业
if v.changeProId == _position or _position == 0 then --0 全职业
heros[index] = v
index = index + 1
end
@ -206,7 +206,7 @@ function this.SingleHeroDataShow(_go,_heroData)
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(HeroConfig[heroData.id].PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
Util.GetGameObject(go.transform, "Text"):GetComponent("Text").text = SubString2(GetLanguageStrById(heroData.name),8 )
local formationMask = Util.GetGameObject(go.transform, "formationMask")

View File

@ -183,8 +183,16 @@ end
local lastLiveName
function TimeLimitUpHero:RefreshHeroData()
Log("curHeroId:"..tostring(curHeroId))
local bool = not not heroConfig[curHeroId]--判断是神将还是什么
curConfig = bool and heroConfig[curHeroId] or itemConfig[curHeroId]
local id=curHeroId
if itemConfig[curHeroId] and itemConfig[curHeroId].RewardGroup then
local rewardConfig=ConfigManager.TryGetConfigData(ConfigName.RewardGroup,itemConfig[curHeroId].RewardGroup[1])
if rewardConfig and rewardConfig.ShowItem then
id=rewardConfig.ShowItem[1][1]
LogError("curHeroId=="..id)
end
end
local bool = not not heroConfig[id]--判断是神将还是什么
curConfig = bool and heroConfig[id] or itemConfig[id]
self.mask1:SetActive(bool)
self.mask2:SetActive(not bool)
if bool then--是神将

View File

@ -106,7 +106,7 @@ function this.SingleHeroDataShow(_go, _heroData)
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
--Util.GetGameObject(go, "posIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(go, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
Util.GetGameObject(go, "heroStage"):SetActive(false)
Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1)

View File

@ -158,7 +158,7 @@ function this.SingleHeroDataShow(_go, _heroData)
Util.GetGameObject(go, "info/lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go, "info/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
--Util.GetGameObject(go, "info/posIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go, "info/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go, "info/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(go, "info/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1)
--剩余血量 无尽副本才显示

View File

@ -269,7 +269,7 @@ function this.SingleHeroDataShow(_go, _heroData)
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--剩余血量 无尽副本才显示
local hpExp = Util.GetGameObject(go, "hpExp")

View File

@ -454,7 +454,7 @@ function this.GetElementIndex(curFormation)
if not temp then
--LogGreen(go.heroId.."这个英雄不存在")
else
local heroPropertyType = temp.heroConfig.PropertyName
local heroPropertyType = temp.changeProId
table.insert(elementPropertyList, heroPropertyType)
end
else

View File

@ -39,7 +39,7 @@ local tempPowerNum=0 --临时战力
local panelType
local parameter --透传参数
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"}
local isPress = false
-- 各个类型编队系统逻辑列表
this.PanelOptionView = {
@ -119,7 +119,7 @@ function this:InitComponent()
this.scrollView.moveTween.Strength = 2
--筛选按钮
for i = 0, 4 do
for i = 0, 5 do
tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Grid/Btn" .. i)
if tabsImg[i + 1] then
Util.GetGameObject(tabs[i], "Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(tabsImg[i + 1])
@ -507,6 +507,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
local heroData = HeroManager.GetSingleHeroData(heroId)
local kaPaiEffect=Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai")
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
local liveName = heroData.live
local roleConfig = {}
local toward=0
@ -530,6 +531,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.skinId)
toward=roleConfig.Toward
end
local scale = roleConfig.play_liveScale
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
@ -557,7 +559,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroData.star])
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local star,starType = heroData.GetStar()
if starType == 3 then
if heroData.star>11 then
@ -803,12 +805,13 @@ function this.SingleHeroDataShow(_go, _heroData)
local choosedObj = Util.GetGameObject(go, "choosed")
local hpExp = Util.GetGameObject(go, "hpExp")
local redPot = Util.GetGameObject(go, "redpoint")
local changeProBtn=Util.GetGameObject(go,"proMaskObj")
if heroData.isNew and heroData.isNew == 1 then
redPot.gameObject:SetActive(true)
else
redPot.gameObject:SetActive(false)
end
changeProBtn:SetActive(_heroData.changeProId>=5)
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
icon.sprite=this.spLoader:LoadSprite(heroData.icon)
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
@ -821,7 +824,7 @@ function this.SingleHeroDataShow(_go, _heroData)
lv.text=heroData.lv
end
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon)
local star,starType = heroData.GetStar(1)
local starSize = Vector2.New(30,30)
@ -917,6 +920,13 @@ function this.SingleHeroDataShow(_go, _heroData)
end
-- 点击事件
Util.AddOnceClick(go, function()
if heroData.changeProId>=5 then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChangeHeroPro,heroData,function()
LogError("刷新界面数据")
this.RefreshShow(false,false)
end)
return
end
-- 判断是上阵还是下阵
local formationAction = FORMATION_ACTION.UP
for k, v in ipairs(this.choosedList) do

View File

@ -219,7 +219,7 @@ function FormationSetPanel:SingleHeroDataShow(_go,_heroData)
Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = GetLanguageStrById(heroData.heroConfig.ReadingName)
Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.painting)
Util.GetGameObject(_go.transform, "card/pos/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = self.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
Util.GetGameObject(_go.transform, "card/redPoint"):SetActive(false)
local starGrid = Util.GetGameObject(_go.transform, "star")

View File

@ -47,7 +47,7 @@ function this.GetHeroList(propId)
if propId and propId ~= ProIdConst.All then
local tempHeros = {}
for k, v in ipairs(allHeros) do
if propId == v.heroConfig.PropertyName then
if propId == v.changeProId then
table.insert(tempHeros, v)
end
end

View File

@ -161,7 +161,7 @@ function this:Refresh(_data,_item)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
_item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
_item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
_item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
_item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
_item.heroList[pos].heroData = heroData
end
_item.exploring.gameObject:SetActive(false)

View File

@ -403,7 +403,7 @@ function this.RefreshFormation(_item,_data)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
_item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
_item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
_item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
_item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
_item.heroList[pos].heroData = heroData
end
this.SetMapName(_data.formationId)

View File

@ -62,13 +62,13 @@ function this:OnShow(_parent,_Data)
data[oldIndex][index] = {}
data[oldIndex][index].id = curHeroData.heroConfig.Id
data[oldIndex][index].star = v[1]
data[oldIndex][index].property = curHeroData.heroConfig.PropertyName
data[oldIndex][index].property = curHeroData.changeProId
data[oldIndex][index].num = 0
index = index + 1
data[oldIndex][index] = {}
data[oldIndex][index].id = curHeroData.heroConfig.Id
data[oldIndex][index].star = v[1] - 1
data[oldIndex][index].property = curHeroData.heroConfig.PropertyName
data[oldIndex][index].property = curHeroData.changeProId
data[oldIndex][index].num = 0
end
index = index + 1
@ -85,7 +85,7 @@ function this:OnShow(_parent,_Data)
end
data[oldIndex][index].star = config.StarLimit
if config.IsSameClan == 1 then
data[oldIndex][index].property = curHeroData.heroConfig.PropertyName
data[oldIndex][index].property = curHeroData.changeProId
else
data[oldIndex][index].property = 0
end

View File

@ -284,7 +284,7 @@ function GeneralBigPopup_RoleGodSoulUp:SetSingleData(index,go,heroData)
self.itemlist[index].lv.text = self.itemlist[index].data.lv
end
self.itemlist[index].name.text = self.itemlist[index].data.heroConfig.ReadingName
self.itemlist[index].pro.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(self.itemlist[index].data.heroConfig.PropertyName))
self.itemlist[index].pro.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(self.itemlist[index].data.changeProId))
self.itemlist[index].pos.sprite = self.spLoader:LoadSprite(self.itemlist[index].data.professionIcon)
local star,starType = self.itemlist[index].data.GetStar(1)
@ -479,7 +479,7 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh)
SetHeroStars(self.spLoader,self.reSelectList[i].star,star,starType,starSize,starScale)
SetHeroFlyEffect(self.reSelectList[i].btn,self.spLoader,tempHeroData.star,sortingOrder+1,1,3)
Util.SetParticleSortLayer(self.reSelectList[i].star,sortingOrder + 1)
self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.heroConfig.PropertyName))
self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.changeProId))
self.reSelectList[i].posIcon.sprite = self.spLoader:LoadSprite(tempHeroData.professionIcon)
Util.SetGray(self.reSelectList[i].icon.gameObject,false)
Util.SetGray(self.reSelectList[i].name.gameObject,false)

View File

@ -103,7 +103,7 @@ function this:ShowSingleData(go,heroData,index)
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local starGrid = Util.GetGameObject(go, "star")
local starPre = Util.GetGameObject(go, "starPre")

View File

@ -527,7 +527,7 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
heroData.professionIcon = GetJobSpriteStrByJobNum(1)
end
heroData.name = GetLanguageStrById(_configData.ReadingName)
heroData.property = _configData.PropertyName
heroData.property = _msgHeroData.propertyId
heroData.godSoulLv = _msgHeroData.godSoulLv or 0
heroData.GetStar = function(index)
if heroData.godSoulLv and heroData.godSoulLv > 0 then

View File

@ -118,7 +118,7 @@ function EnvoyItem:SetItem(go,data)
end
self.icon:GetComponent("Image").sprite = self.spLoader:LoadSprite(heroSingleData.icon)
self.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroSingleData.heroConfig.PropertyName))
self.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroSingleData.changeProId))
local star,starType = heroSingleData.GetStar(1)
SetHeroStars(self.spLoader, self.starGrid, star,starType,nil,nil,Vector2.New(0,1))

View File

@ -95,7 +95,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index)
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroSingleData.icon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroSingleData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroSingleData.changeProId))
local starGrid = Util.GetGameObject(go.transform, "star")
local star,starType = heroSingleData.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1))

View File

@ -118,7 +118,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index)
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.icon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(data.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(data.changeProId))
local starGrid = Util.GetGameObject(go.transform, "star")
local star,starType = data.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1))

View File

@ -261,7 +261,7 @@ function this.SingleItemDataShow(clone,Itemdata)
Util.GetGameObject(clone.transform, "GameObject/frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(Itemdata.heroConfig.Quality,Itemdata.star))
Util.GetGameObject(clone.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#0f0>%d</color>",Itemdata.lv)
Util.GetGameObject(clone.transform, "GameObject/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(Itemdata.icon)
Util.GetGameObject(clone.transform, "GameObject/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(Itemdata.heroConfig.PropertyName))
Util.GetGameObject(clone.transform, "GameObject/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(Itemdata.changeProId))
local starGrid = Util.GetGameObject(clone.transform, "GameObject/star")
local star,starType = Itemdata.GetStar(1)
SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1))

View File

@ -113,10 +113,13 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
heroData.lockState = _msgHeroData.lockState
heroData.createtype = _msgHeroData.createtype
heroData.changeId = _msgHeroData.changeId--置换id
heroData.changeProId= _msgHeroData.propertyId --英雄的阵营id
--LogError("changeproid=="..heroData.changeProId)
heroData.formationList = {}--所在编队list
--本地 or 援助
local _configData = heroConfig[_id]
heroData.heroConfig = heroConfig[_id]
--heroData.heroConfig.PropertyName=heroData.changeId
heroData.maxStar = _configData.MaxRank
--Log(heroData.heroConfig.ReadingName.." _msgHeroData.starBreakId ".._msgHeroData.starBreakId)
local actionPowerRormula = gameSetting[1].ActionPowerRormula
@ -171,7 +174,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
heroData.professionIcon = GetHeroPosStr(1)--GetJobSpriteStrByJobNum(1)
end
heroData.name = GetLanguageStrById(_configData.ReadingName)
heroData.property = _configData.PropertyName
heroData.property = heroData.changeProId
heroData.sortId = #heroDatas + 1
heroData.harmonyGongMing = _msgHeroData.createtype
@ -270,6 +273,12 @@ function this.SetTalismanLv(did, lv)
heroDatas[did].talismanList = lv
end
function this.SetHeroPro(id,pro)
heroDatas[id].changeProId = pro
heroDatas[id].property = pro
end
function this.SetSoulPrint(soulPos,did)
local soulPrintList = {}
if (#soulPos > 0) then
@ -794,7 +803,7 @@ function this.GetUpStarHeroListData(heroRankUpGroupId, heroData)
if v.id == heroData.id then
if v.star == heroRankUpGroup.StarLimit then
if heroRankUpGroup.IsSameClan == 1 then
if v.property == heroData.property then
if v.heroConfig.PropertyName == heroData.heroConfig.PropertyName then
if heroRankUpGroup.IsId > 0 then
if v.id == heroRankUpGroup.IsId then
table.insert(needHeroListData, v)
@ -870,7 +879,7 @@ function this.GetUpStarHeroListData(heroRankUpGroupId, heroData)
local canSeleItemIds = {}
if heroRankUpGroup.ItemCamp and #heroRankUpGroup.ItemCamp > 0 then
for i = 1, #heroRankUpGroup.ItemCamp do
if heroData.heroConfig.PropertyName == heroRankUpGroup.ItemCamp[i][1] then
if heroData.changeProId == heroRankUpGroup.ItemCamp[i][1] then
local itemId = heroRankUpGroup.ItemCamp[i][2]
local haveNum = BagManager.GetItemCountById(itemId)
if haveNum > 0 then
@ -1756,9 +1765,9 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
if teamHeroInfos[i] then
heroAllNum = heroAllNum + 1
local heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal =
CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil)
CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).changeProId or nil)
local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal =
CalculateHeroUpTalismanProAddVal(teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil)
CalculateHeroUpTalismanProAddVal(teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).changeProId or nil)
local soulPrinSingleHeroProVal,soulPrinLvProVal,soulPrinAllHeroProVal,soulPrinSpecialProVal = CalculateSoulPrintAddVal(teamHeroInfos[i].heroId)
local heroSkinSingleProVal, heroSkinAllHeroProVal = HeroSkinManager.CaculateSkinProVal(teamHeroInfos[i].heroId)
this.DoubleTableCompound(teamProVal, heroSkillAllHeroProVal)
@ -3505,7 +3514,7 @@ function this.GetHeroIsUpTreasure(heroDid,pos)
end
end
end
local allEquipTreasures = EquipTreasureManager.GetAllTreasuresByLocation(pos, heroData.heroConfig.PropertyName)
local allEquipTreasures = EquipTreasureManager.GetAllTreasuresByLocation(pos,heroData.changeProId)
for k, v in ipairs(allEquipTreasures) do
--比较战力 高战力的装备add
if lackEquips[v.equipType].id == "0" then

View File

@ -167,6 +167,7 @@ function this.CreateHeroCountData(dId)
soulPrintList = {},
talismanLv = 1,
formationId = FormationTypeDef.FORMATION_NORMAL,
zhenYingId=0,
}
if not dId then
return heroData
@ -188,6 +189,7 @@ function this.CreateHeroCountData(dId)
heroData.soulPrintList = curHeroData.soulPrintList -- 魂印数据
heroData.talismanLv = curHeroData.talismanList -- 法宝等级
heroData.formationId = FormationTypeDef.FORMATION_NORMAL
heroData.zhenYingId = curHeroData.changeProId
return heroData
end

View File

@ -28,7 +28,10 @@ Condition_Prop_Func = {
--
local config = heroConfig[target.tId]
-- 判断元素是否符合条件
if config and args and config.PropertyName == tonumber(args[1]) then
--LogError("zhenyingid=="..target.zhenYingId)
-- LogError("target.did=="..target.dId)
local heroData=HeroManager.GetSingleHeroData(target.dId)
if config and args and heroData.changeProId == tonumber(args[1]) then
return propList
end
end,
@ -37,11 +40,13 @@ Condition_Prop_Func = {
local num=0
for _, hero in ipairs(teamInfo.teamHeroInfos) do
local heroData=HeroManager.GetSingleHeroData(hero.heroId)
if heroData and heroData.heroConfig.PropertyName==args[1] then
if heroData and heroData.changeProId==args[1] then
-- LogError("")
num=num+1
end
end
local newProList={}
LogError("num=="..num)
for key, value in pairs(propList) do
newProList[key]=value*num
end

View File

@ -524,6 +524,7 @@ Hero_Prop_Func = {
end,
[Hero_Prop_Type.TailsManSou] = function(_heroData)
--属性相关修改
local propList, conPropList, teamPropList, conTeamPropList, dePropList
local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower1(_heroData)
if SingleProVal and #SingleProVal > 0 then

View File

@ -278,6 +278,7 @@ function HeroLikeAbilityPanel:SetSelectKuang(isMove)
end
self.select.transform.localPosition = Vector3.New(-7.5,3.5)
self.popup:SetActive(true)
LogError("curheroData.id=="..curHeroData.Id)
self.popupText.text = string.format( "好感度+%s",LikabilityManager.GetCurItemValue(curHeroData.Id,curselectId,1))
end
end

View File

@ -152,6 +152,8 @@ end
function this.GetCurItemValue(heroId,itemId,itemNum)
local value = 0
local tempheroConfig = heroConfig[heroId]
LogError("heroid=="..heroId)
LogError("itemid=="..itemId)
value = this.ItemList[itemId][tempheroConfig.PropertyName]*itemNum
return value
end

View File

@ -11,7 +11,7 @@ local pos = {
}
local sortOrder = 0
local tabs = {}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"}
local proId = 0
local heroData = {}
function LikeAbilityPanel:InitComponent()
@ -24,7 +24,7 @@ function LikeAbilityPanel:InitComponent()
local v = self.heroGrid:GetComponent("RectTransform").rect
self.heroScroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,self.heroGrid.transform,self.heroPre, nil, Vector2.New(v.width, v.height), 1, 4, Vector2.New(50,50))
self.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
for i = 0, 4 do
for i = 0, 5 do
tabs[i] = Util.GetGameObject(self.btnPrant,"grid/Btn" .. i)
if tabsImg[i + 1] then
Util.GetGameObject(tabs[i], "Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(tabsImg[i + 1])
@ -65,7 +65,7 @@ function LikeAbilityPanel:InitComponent()
end
function LikeAbilityPanel:BindEvent()
for i = 0, 4 do
for i = 0, 5 do
Util.AddClick(tabs[i], function()
if i == proId then
proId = ProIdConst.All

View File

@ -350,7 +350,7 @@ function this.InitSingleEndlessHero(_msgHeroData)
heroData.professionIcon = GetJobSpriteStrByJobNum(1)
end
heroData.name = GetLanguageStrById(heroData.heroConfig.ReadingName)
heroData.property = heroData.heroConfig.PropertyName
heroData.property = _msgHeroData.propertyId
heroData.sortId = #this.heroDataLists + 1
heroData.harmonyGongMing = _msgHeroData.createtype

View File

@ -428,7 +428,7 @@ function EndLessMapView:ShowHeroData()
local heroData = HeroManager.GetSingleHeroData(v.heroId)
this.heroList[i].frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
SetHeroIcon(this.spLoader,heroData,this.heroList[i].icon,heroData.heroConfig)
this.heroList[i].pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
this.heroList[i].pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
this.heroList[i].lv.text=heroData.lv
--spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation
local star,starType = heroData.GetStar(1)

View File

@ -399,7 +399,7 @@ function this.UpdateHeroDatas(_msgHeroData,_msgPlayerData)
heroData.professionIcon = GetJobSpriteStrByJobNum(1)
end
heroData.name = _configData.ReadingName
heroData.property = _configData.PropertyName
heroData.property = _msgHeroData.propertyId
heroData.createtype = 1
heroData.warPower = 0
heroData.godSoulLv = _msgHeroData.godSoulLv or 0

View File

@ -3286,6 +3286,24 @@ function this.HeroRetureEvent(heroId, func, indexType)
end)
end
--请求英雄回溯
function this.ChangeHeroPro(heroId,pro,func)
local data = HeroInfoProto_pb.GodDevilHeroSelectPropRequest()
LogError("HeroRetureEvent "..heroId)
data.heroId = heroId
data.propId = pro
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GOD_DEVIL_HERO_SELECT_PROP_REQUEST, MessageTypeProto_pb.GOD_DEVIL_HERO_SELECT_PROP_RESPONSE, msg, function(buffer)
--local data = buffer:DataByte()
HeroManager.SetHeroPro(heroId,pro)
PopupTipPanel.ShowTip("阵营转换成功")
if func then
func()
end
end)
end
-- 请求关卡排行
function this.RequestFightRank(func)
Network:SendMessageWithCallBack(MessageTypeProto_pb.MAIN_LEVEL_GET_RANK_REQUEST, MessageTypeProto_pb.MAIN_LEVEL_GET_RANK_RESPONSE, nil, function(buffer)

View File

@ -43,6 +43,9 @@ function this.RechargeSuccessOrder(msg)
end
function this.Pay(id, func)
if not RECHARGEABLE then
return
end
LogRed("发起购买商品的请求商品id = "..id)
if not func then
func = function()end

View File

@ -104,6 +104,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_ChangeHeroProConfirm",0)
PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0)
end

View File

@ -94,7 +94,12 @@ local contentScripts = {
[GENERAL_POPUP_TYPE.ResolveReStar] = {view = require("Modules/Popup/View/GeneralPopup_ResolveReStar"), panelName = "GeneralPopup_ResolveReStar"},
--家园装备升级
[GENERAL_POPUP_TYPE.HomeLandEquip] = {view = require("Modules/Popup/View/GeneralPopup_HomeLandEquip"), panelName = "GeneralPopup_HomeLandEquip"},
--改变英雄阵营
[GENERAL_POPUP_TYPE.ChangeHeroPro] = {view = require("Modules/Popup/View/GeneralPopup_ChangeHeroPro"), panelName = "GeneralPopup_ChangeHeroPro"},
--改变英雄阵营确认界面
--[GENERAL_POPUP_TYPE.ChangeHeroProConfirm] = {view = require("Modules/Popup/View/GeneralPopup_ChangeHeroProConfirm"), panelName = "GeneralPopup_ChangeHeroProConfirm"},
}
--子模块预设
local contentPrefabs={}
--打开弹窗类型

View File

@ -51,7 +51,7 @@ function MapRoleInfoPopup:OnOpen(...)
--this.profession.sprite = this.spLoader:LoadSprite(GetResourcePath(curHeroData.ProfessionResourceId))
-- 角色属性图标
this.pos.sprite = this.spLoader:LoadSprite(curHeroData.professionIcon)
this.pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
this.lv.text =string.format(Language[11487],curHeroData.lv)
this.heroName.text = curHeroData.name
local star,starType = curHeroData.GetStar(1)

View File

@ -411,7 +411,7 @@ function this.FormationAdapter(teamInfo)
SetHeroStars(this.spLoader, this.Demons[hero.position].starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(this.Demons[hero.position].starGrid,this.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
this.Demons[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
this.Demons[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
this.Demons[hero.position].levelText.text = hero.level
this.Demons[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(this.spLoader, hero,this.Demons[hero.position].icon,heroConfig)

View File

@ -260,7 +260,7 @@ function this.RoleInfo0()
LogBlue(curHeroData.id.." "..curHeroData.dynamicId)
this.head_Frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curHeroData.star))
this.head_Icon.sprite = this.spLoader:LoadSprite(curHeroData.icon)
this.head_Pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.head_Pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
this.head_Lv.text = curHeroData.lv
local star,starType = curHeroData.GetStar(1)
SetHeroStars(this.spLoader, this.head_Star, star,starType)

View File

@ -0,0 +1,89 @@
require("Base/BasePanel")
local ChangeHeroProConfirmWindow = Inherit(BasePanel)
----- 招募二次确认弹窗 -----
local this = ChangeHeroProConfirmWindow
local costConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,147)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local func
function ChangeHeroProConfirmWindow:InitComponent()
LogError("1111111111111")
local gameObject=self.gameObject
this.bgBtn=gameObject
this.titleText=Util.GetGameObject(gameObject,"content/TitleText"):GetComponent("Text")
this.root = Util.GetGameObject(gameObject, "Root")
this.confirm = Util.GetGameObject(gameObject, "ConfirmBtn")
this.cancel = Util.GetGameObject(gameObject, "CancelBtn")
this.closeBtn = Util.GetGameObject(gameObject, "content/BG/BackBtn")
this.btn=Util.GetGameObject(this.root,"Btn1")
this.rootText=Util.GetGameObject(this.root,"Text"):GetComponent("Text")
end
function ChangeHeroProConfirmWindow:BindEvent()
Util.AddClick(this.confirm,function()
self:ClosePanel()
if func then
func()
end
end)
Util.AddClick(this.cancel,function()
self:ClosePanel()
end)
Util.AddClick(this.closeBtn,function()
self:ClosePanel()
end)
Util.AddClick(this.bgBtn,function()
self:ClosePanel()
end)
end
function ChangeHeroProConfirmWindow:AddListener()
end
function ChangeHeroProConfirmWindow:RemoveListener()
end
function ChangeHeroProConfirmWindow:OnOpen(...)
--parent=_parent
--sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
func = _args[2]
this.titleText.text=Language[11309]
if costConfig then
local cost=string.split(costConfig.Value,('#'))
this.rootText.text="确认花费"..cost[2]..itemConfig[tonumber(cost[1])].Name..",转换神将阵营?"
else
this.rootText.text="确认花费1000妖晶转换神将阵营"
end
local go=Util.GetGameObject(this.btn,"Go")
local var
--点将台抽卡
if _args[1] == CostConfirmType.ChangeHeroPro then
var=PlayerManager.uid.."GeneralPopup_ChangeHeroProConfirm"
end
Util.AddOnceClick(this.btn,function()
this.btnClick=(this.btnClick and this.btnClick==1) and 0 or 1
LogPink(var..":"..this.btnClick)
PlayerPrefs.SetInt(var,this.btnClick)
go:SetActive(PlayerPrefs.GetInt(var)==1)
end)
if PlayerPrefs.HasKey(var) then
go:SetActive(PlayerPrefs.GetInt(var)==1)
else
go:SetActive(false)
end
end
function ChangeHeroProConfirmWindow:OnClose()
end
function ChangeHeroProConfirmWindow:OnDestroy()
end
return ChangeHeroProConfirmWindow

View File

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

View File

@ -0,0 +1,171 @@
----- 归元弹窗 -----
local this = {}
--传入父脚本模块
local parent
--层级
local sortingOrder = 0
--传入不定参
local _args = {}
--传入选择英雄计算返回奖励数据列表
local dropList = {}
--item容器
local itemList = {}
--传入选择英雄
local selectHeroData
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local proId=0
local isCan=false
local curProId=0
local costConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,147)
local itemNum=0
local costId=0
local func=nil
function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
this.titleText = Util.GetGameObject(gameObject, "TitleText"):GetComponent("Text")
this.bodyText = Util.GetGameObject(gameObject, "BodyText"):GetComponent("Text")
this.cancelBtn = Util.GetGameObject(gameObject, "CancelBtn")
this.confirmBtn = Util.GetGameObject(gameObject, "ConfirmBtn")
this.itemImage = Util.GetGameObject(gameObject, "ConfirmBtn/itemImage"):GetComponent("Image")
this.itemImageText = Util.GetGameObject(gameObject, "ConfirmBtn/itemText"):GetComponent("Text")
this.selectBtn=Util.GetGameObject(gameObject, "Tabs/selectBtn")
this.hintTxt=Util.GetGameObject(gameObject, "tipTxt")
this.btns={}
for i = 1, 4 do
this.btns[i]=Util.GetGameObject(gameObject, "Tabs/grid/Btn"..i)
end
end
--页签选中效果设置
function this:SetSelectBtn(index)
this.selectBtn.transform:SetParent(this.btns[index].transform)
this.selectBtn.transform.localScale = Vector3.one
this.selectBtn.transform.localPosition=Vector3.zero
end
function this:BindEvent()
Util.AddClick(this.cancelBtn,function()
parent:ClosePanel()
end)
for i = 1, 4 do
Util.AddClick(this.btns[i], function()
if i == curProId then
return
end
proId=i
this:SetSelectBtn(i)
end)
end
Util.AddClick(this.confirmBtn,function()
if not isCan then
LogError("costid=="..costId)
PopupTipPanel.ShowTip(string.format( Language[10298],itemConfig[costId].Name))
return
end
local state=PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_ChangeHeroProConfirm")
if curProId==proId then
return
end
if selectHeroData.changeProId==5 then
this:ChangeHeroPro()
return
end
if state==1 then
this:ChangeHeroPro()
else
UIManager.OpenPanel(UIName.ChangeHeroProConfirmWindow,CostConfirmType.ChangeHeroPro,function()
this:ChangeHeroPro()
end)
end
end)
end
function this:ChangeHeroPro()
NetManager.ChangeHeroPro(selectHeroData.dynamicId,proId,function()
curProId=proId
parent:ClosePanel()
if func then
func()
end
end)
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent,...)
parent=_parent
sortingOrder =_parent.sortingOrder
local args = {...}
selectHeroData = args[1]
func=args[2]
LogError("selectHeroData.changeProId== "..selectHeroData.changeProId)
curProId=selectHeroData.changeProId
-- if curProId==5 then
-- proId=1
-- else
-- proId=curProId
-- end
for i = 1, 5 do
if i~=curProId then
proId=i
break
end
end
itemNum=0
this.titleText.text="阵营转换"
--this.bodyText.text = string.format("归元神将会返还所有的升级材料神将重置为1级\n 此操作不可逆,是否确认归元?")
for i = 1, #this.btns do
Util.GetGameObject(this.btns[i], "Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(i))
if i==curProId then
Util.SetGray(this.btns[i],true)
else
Util.SetGray(this.btns[i],false)
end
end
this:SetSelectBtn(proId)
if curProId==5 then
this.hintTxt.gameObject:SetActive(true)
this.itemImage.gameObject:SetActive(false)
this.itemImageText.gameObject:SetActive(false)
else
this.hintTxt.gameObject:SetActive(false)
this.itemImage.gameObject:SetActive(true)
this.itemImageText.gameObject:SetActive(true)
end
this:RefreshCostShow()
end
function this:RefreshCostShow()
if costConfig then
local cost=string.split(costConfig.Value,('#'))
costId=tonumber(cost[1])
itemNum = BagManager.GetItemCountById(costId)
if itemNum >=tonumber(cost[2]) then
this.itemImageText.text = string.format("<color=#FFF8EC>×%s</color>", cost[2])
isCan=true
else
isCan=false
this.itemImageText.text = string.format("<color=#C66366FF>×%s</color>", cost[2])
end
this.itemImage.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[tonumber(cost[1])].ResourceID))
end
end
function this:OnClose()
end
function this:OnDestroy()
this.spLoader:Destroy()
end
return this

View File

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

View File

@ -36,7 +36,7 @@ function this:InitComponent(gameObject)
this.selectBar = Util.GetGameObject(gameObject,"selectBar")
this.light = Util.GetGameObject(this.selectBar,"selectBtn")
this.btnList = {}
for i = 1, 5 do
for i = 1, 6 do
this.btnList[i] = Util.GetGameObject(this.selectBar,"btn"..i)
end
this.choosedList = {}
@ -52,7 +52,7 @@ function this:BindEvent()
end
parent:ClosePanel()
end)
for i = 1, 5 do
for i = 1, 6 do
Util.AddClick(this.btnList[i],function()
if curPage ~= i then
this:Refresh(i)
@ -90,23 +90,25 @@ function this:OnShow(_parent,_args)
end
function this:Refresh(_page)
curPage = _page
LogError("page==".._page)
this.light.transform:SetParent(this.btnList[_page].transform)
this.light.transform.localPosition = Vector3.zero
local heroDatas={}
for i = 1, #heros do
local CONFIG = heros[i][2] == 5 and itemConfig or heroConfig
LogError(tostring(heros[i]))
local CONFIG = heros[i][2] == 6 and itemConfig or heroConfig
if CONFIG[heros[i][1]] then
if not heroDatas[heros[i][2]] then
heroDatas[heros[i][2]] = {}
end
-- 特殊物品 或者 加入了版本的神将
if heros[i][2] == 5 or HeroManager.InVersion(heros[i][1]) then
if heros[i][2] == 6 or HeroManager.InVersion(heros[i][1]) then
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2]})
end
end
end
for i = 1, 5 do
for i = 1, 6 do
if not heroDatas[i] then
this.btnList[i]:SetActive(false)
else
@ -134,7 +136,7 @@ function this.SingleHeroDataShow(go,_heroData,_index)
local choosed = Util.GetGameObject(_go.transform, "choosed")
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
if itemType ~= 5 then
if itemType ~= 6 then
name.text = SubString2(GetLanguageStrById(heroData.ReadingName),8)
icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name)
proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
@ -159,7 +161,7 @@ function this.SingleHeroDataShow(go,_heroData,_index)
end)
Util.AddLongPressClick(cardclickBtn, function()
if itemType ~= 5 then
if itemType ~= 6 then
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroData.Id, heroData.Star)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,heroData.Id)

View File

@ -272,7 +272,7 @@ function this.SingleHeroDataShow(go, heroData, index)
Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go, "posIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
Util.GetGameObject(go, "heroStage"):SetActive(false)
--Util.GetGameObject(go, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local starGrid = Util.GetGameObject(go, "star")

View File

@ -255,7 +255,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
icon.sprite = self.spLoader:LoadSprite(heroData.icon)
lv.text = heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local star,starType = heroData.GetStar(1)
SetHeroStars(self.spLoader,starGrid, star,starType)
SetHeroFlyEffect(Util.GetGameObject(self.itemPre, "GameObject"),self.spLoader,heroData.star,self.sortingOrder+1,1,3,0)
@ -271,7 +271,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(_heroData.heroConfig.Quality,_heroData.star))
icon.sprite = self.spLoader:LoadSprite(_heroData.icon)
lv.text = _heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName))
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.changeProId))
local star,starType = _heroData.GetStar(1)
SetHeroStars(self.spLoader,starGrid, star,starType)
Util.SetParticleSortLayer(starGrid,self.sortingOrder + 1)

View File

@ -108,7 +108,7 @@ function this.SingleHeroDataShow(go,_heroData)
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName),8)
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local starGrid = Util.GetGameObject(_go.transform, "star")
local star,starType = heroData.GetStar(1)

View File

@ -140,7 +140,7 @@ function this.SingleHeroDataShow(go,_heroData)
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName),8)
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(_go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local starGrid = Util.GetGameObject(_go.transform, "star")
local star,starType = heroData.GetStar(1)

View File

@ -130,7 +130,7 @@ function this.SingleHeroDataShow(go,_heroData)
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text =SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName),8)
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local starGrid = Util.GetGameObject(_go.transform, "star")
SetHeroStars(this.spLoader, starGrid, heroData.star,1,nil,-15)
local choosed =Util.GetGameObject(_go.transform, "choosed")

View File

@ -148,11 +148,11 @@ function RoleAwakeLayout:UpdateHeroUpStarData()
Util.GetGameObject(go.transform,"iconDefault"):SetActive(false)
Util.GetGameObject(go.transform,"icon"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
if curUpStarData[i].upStarMaterialsData.Issame==1 then
Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
elseif curUpStarData[i].upStarMaterialsData.IsId>0 then
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curUpStarData[i].upStarMaterialsData.IsId)
Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(heroConfig.Icon))
@ -162,7 +162,7 @@ function RoleAwakeLayout:UpdateHeroUpStarData()
else
if curUpStarData[i].upStarMaterialsData.IsSameClan ==1 then
Util.GetGameObject(go.transform, "iconbg/proImage"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
end
Util.GetGameObject(go.transform,"iconDefault"):SetActive(true)
Util.GetGameObject(go.transform,"icon"):SetActive(false)

View File

@ -83,7 +83,7 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale,Vector2.New(0.5,0.5))
Util.SetParticleSortLayer(this.starGrid,self.sortingOrder + 1)
this.profession.sprite = this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
this.heroName.text =GetLanguageStrById(curHeroData.heroConfig.ReadingName)
this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession))
this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation)

View File

@ -157,7 +157,7 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)--:GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local formationMask = Util.GetGameObject(go.transform, "formationMask")
--LogError("heroData.isFormation "..heroData.isFormation)

View File

@ -307,7 +307,7 @@ function this:AllEquipUpBtnOnClick()
local curPosEquip = {}
local index = i
if (index == 5 or index == 6) and isCanUpEquipTreasure then
curPosEquip = EquipTreasureManager.GetAllTreasuresByLocation(index - 4, curHeroData.heroConfig.PropertyName)
curPosEquip = EquipTreasureManager.GetAllTreasuresByLocation(index - 4, curHeroData.changeProId)
else
--获取到所有未装备的装备
curPosEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, index)
@ -481,7 +481,7 @@ function this.ShowHeroEquip()
this.heroLv.text = curHeroData.lv
this.heroIcon.sprite = this.spLoader:LoadSprite(curHeroData.painting)
--SetHEeroLiveToward(this.heroIcon,curHeroData.heroConfig.Toward)
this.heroProIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.heroProIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
local star,starType = curHeroData.GetStar(1)
local starScale = -10
if starType == 3 then
@ -633,7 +633,7 @@ function this:OnClickTabBtn(_index)
this:SetItemData(allEquip)
else
local allEquipTreasure
allEquipTreasure = EquipTreasureManager.GetAllTreasuresByLocation(_index - 4, curHeroData.heroConfig.PropertyName)
allEquipTreasure = EquipTreasureManager.GetAllTreasuresByLocation(_index - 4, curHeroData.changeProId)
this:SortEquipDatas1(allEquipTreasure)
--"装备数量:"
this.itemNumText.text = Language[12181] .. LengthOfTable(allEquipTreasure)

View File

@ -192,11 +192,11 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
Util.GetGameObject(go.transform,"iconDefault"):SetActive(false)
Util.GetGameObject(go.transform,"icon"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
if curUpStarData[i].upStarMaterialsData.Issame==1 then
Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))
Util.GetGameObject(go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality, curUpStarData[i].upStarMaterialsData.StarLimit))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
elseif curUpStarData[i].upStarMaterialsData.IsId>0 then
local heroConfig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig, curUpStarData[i].upStarMaterialsData.IsId)
if heroConfig then
@ -218,7 +218,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
else
if curUpStarData[i].upStarMaterialsData.IsSameClan ==1 then
Util.GetGameObject(go.transform, "iconbg/proImage"):SetActive(true)
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "iconbg/proImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
end
Util.GetGameObject(go.transform,"iconDefault"):SetActive(true)
Util.GetGameObject(go.transform,"icon"):SetActive(false)

View File

@ -112,8 +112,8 @@ function RoleFlyUpSuccessPanel:OnOpen(...)
SetHEeroLiveToward(this.LiveGO,curHeroData.heroConfig.Toward)
this.profession.sprite = this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
LogPink("curHeroData.heroConfig.PropertyName"..curHeroData.heroConfig.PropertyName)
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
LogPink("curHeroData.changeProId"..curHeroData.changeProId)
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
local upStar=curHeroData.star+1
local flyImg=""
if upStar==12 then

View File

@ -149,7 +149,7 @@ function RoleGodSoulLayout:SetHeroData(heroGo,heroData,isCur)
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
SetHeroFlyEffect(heroGo,self.spLoader,heroData.star,self.sortingOrder + 1,0.65,2)
end
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
SetHeroIcon(self.spLoader,heroData,icon,heroData.heroConfig)
SetHeroStars(self.spLoader, starGrid, star,starType,starSize,starScale)

View File

@ -1,4 +1,5 @@
require("Base/BasePanel")
local listpanel=require("Modules/RoleInfo/RoleListPanel")
RoleInfoPanel = Inherit(BasePanel)
local this = RoleInfoPanel
local _CurPageIndex = 1
@ -52,6 +53,7 @@ local isClickLeftOrRightBtn = true--点击左右按钮切换英雄播放动画
local teamHero = {}--主线编队成员信息
local talismanIsOpen = false--法宝是否开启
local soulPrintIsOpen = false--魂印是否开启
local isProChange=false
--初始化组件(用于子类重写)
function RoleInfoPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -60,7 +62,7 @@ function RoleInfoPanel:InitComponent()
orginLayer = 0
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
this.bgImageList = {}
for i = 1, 4 do
for i = 1, 5 do
this.bgImageList[i] = Util.GetGameObject(self.transform, "bg/di ("..i..")")
end
this.curObj= Util.GetGameObject(self.transform, "curObj")
@ -74,6 +76,7 @@ function RoleInfoPanel:InitComponent()
this.nameInfo = Util.GetGameObject(this.roleInfoRoot, "info")
this.nameAndPossLayout = Util.GetGameObject(this.nameInfo, "nameAndPossLayout")
this.profession = Util.GetGameObject(this.nameAndPossLayout, "proImage"):GetComponent("Image")
this.proChangeBtn=Util.GetGameObject(this.nameInfo, "nameAndPossLayout/proImage/changeBtn")
this.heroName = Util.GetGameObject(this.nameAndPossLayout, "heroName"):GetComponent("Text")
this.starGrid = Util.GetGameObject(this.nameInfo, "sartAndLvLayout")
--上锁
@ -132,6 +135,19 @@ function RoleInfoPanel:BindEvent()
Util.AddClick(this.BtnBack, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
if listpanel and isProChange then
listpanel:ChangeProId(curHeroData.changeProId)
listpanel:GetCurSortHeroListData()
end
end)
--切换阵营按钮
Util.AddClick(this.proChangeBtn, function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChangeHeroPro,curHeroData,function()
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
heroDatas=HeroManager.GetHeroDataByProperty(curHeroData.changeProId)
isProChange=true
RoleInfoPanel:OnShow()
end)
end)
--角色归元按钮
Util.AddClick(this.RecallBtn,function()
@ -257,6 +273,7 @@ function RoleInfoPanel:OnOpen(_curHeroData, _heroDatas,_isUpZhen,_index)
else
_CurPageIndex = RoleInfoPanelIndex.qingbao
end
LogError("herodatas len=="..#_heroDatas)
end
-- 打开,重新打开时回调
@ -264,6 +281,7 @@ function RoleInfoPanel:OnShow()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RoleInfo })
isClickLeftOrRightBtn = true
this.upLvEffect:SetActive(false)
for i = 1, #heroDatas do
if curHeroData.dynamicId == heroDatas[i].dynamicId then
@ -321,7 +339,7 @@ function RoleInfoPanel:OnShow()
else
this.dragView.gameObject:SetActive(false)
end
this:SetPanelBg(curHeroData.heroConfig)
this:SetPanelBg(curHeroData.changeProId)
this:UpdateHeroInfoData()--刷新界面方法
end
@ -334,9 +352,9 @@ function this:UpdateLiveList()
rightHeroData = heroDatas[rightIndex]
end
function this:SetPanelBg(heroData)
for i = 1, 4 do
if heroData.PropertyName == i then
function this:SetPanelBg(index)
for i = 1, 5 do
if index == i then
this.bgImageList[i]:SetActive(true)
else
this.bgImageList[i]:SetActive(false)
@ -407,7 +425,7 @@ function this:RightBtnOnClick()
this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear)
this:SetPanelBg(curHeroData.heroConfig)
this:SetPanelBg(curHeroData.changeProId)
end
@ -476,7 +494,7 @@ function this:LeftBtnOnClick()
this:UpdateHeroInfoData()
this.btnMask.gameObject:SetActive(false)
end):SetEase(Ease.Linear)
this:SetPanelBg(curHeroData.heroConfig)
this:SetPanelBg(curHeroData.changeProId)
end
@ -746,10 +764,15 @@ function this:UpdateHeroInfoData()
this.starGrid:SetActive(true)
------------------------------------------
this.heroName.text = curHeroData.name
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.profession.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(curHeroData.heroConfig.Natural,curHeroData.star))
this.unlockImage:SetActive(curHeroData.lockState == 0)
this.lockImage:SetActive(curHeroData.lockState == 1)
if curHeroData.heroConfig.PropertyName==5 then
this.proChangeBtn:SetActive(true)
else
this.proChangeBtn:SetActive(false)
end
--魂印
soulPrintIsOpen=SoulPrintManager.GetSoulPrintIsOpen(curHeroData)
Util.GetGameObject(this.soulPrintBtn, "lock"):SetActive(not soulPrintIsOpen)
@ -868,6 +891,7 @@ end
--界面关闭时调用(用于子类重写)
function RoleInfoPanel:OnClose()
if this.leftLiveObj and leftHeroData then
poolManager:UnLoadLive(this.leftLiveObj.name, this.leftLiveObj)
this.leftLiveObj = nil
@ -901,6 +925,7 @@ function RoleInfoPanel:OnDestroy()
for k,v in pairs(this.PageList) do
SubUIManager.Close(v)
end
isProChange=false
end
--跳转显示新手提示圈

View File

@ -8,7 +8,7 @@ local teamHero = {}
local roleDatas={}
this.isFirstOpen=true
local tabs = {}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh"}
local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"}
local soulPrintData={}
local orginLayer = 0
local orginLayer2 = 0
@ -241,6 +241,9 @@ function this:GetCurSortHeroListData()
this:SetSelectBtn()
end
function this:ChangeProId(id)
proId=id
end
--设置英雄列表数据
function this:SetRoleList(_roleDatas)
@ -285,7 +288,7 @@ function this.SingleHeroDataShow(_go,_heroData)
Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.painting)
--SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image"),heroData.heroConfig.Toward)
-- Util.GetGameObject(_go.transform, "card/pos/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local redPoint = Util.GetGameObject(_go.transform, "card/redAndLock/redPoint")
Util.GetGameObject(_go.transform, "card/redAndLock/lockImage"):SetActive(heroData.lockState == 1)

View File

@ -77,7 +77,7 @@ function this.OnShowSingleCardData(go,heroData)
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.icon)
Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
--Util.GetGameObject(go.transform, "heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
Util.GetGameObject(go.transform, "heroStage"):SetActive(false)
local formationMask = Util.GetGameObject(go.transform, "formationMask")

View File

@ -134,7 +134,7 @@ function RoleReturnPanel:OnShowHeroData()
--self.heroGo
Util.GetGameObject(self.heroGo, "hero/frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality,curHeroData.star))
Util.GetGameObject(self.heroGo, "hero/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))
Util.GetGameObject(self.heroGo, "hero/proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
Util.GetGameObject(self.heroGo, "hero/proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
Util.GetGameObject(self.heroGo, "hero/lv/Text"):GetComponent("Text").text = curHeroData.lv
Util.GetGameObject(self.heroGo, "hero/posIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetJobSpriteStrByJobNum(curHeroData.heroConfig.Profession))
local star,starType = curHeroData.GetStar(1)

View File

@ -189,7 +189,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
lvGo:SetActive(true)
Util.GetGameObject(lvGo.transform, "Text"):GetComponent("Text").text = heroData.lv
icon.sprite = this.spLoader:LoadSprite(heroData.icon)
proIcon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
proIcon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
formationMask:SetActive((heroData.isFormation ~= "" and heroData.isFormation ~= Language[10410]) or heroData.lockState == 1)
formationImage:SetActive(heroData.isFormation ~= "" )
lockImage:SetActive( heroData.lockState == 1)

View File

@ -112,8 +112,7 @@ function RoleUpStarSuccessPanel:OnOpen(...)
SetHEeroLiveToward(this.LiveGO,curHeroData.heroConfig.Toward)
this.profession.sprite = this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession))
LogPink("curHeroData.heroConfig.PropertyName"..curHeroData.heroConfig.PropertyName)
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
this.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroData.changeProId))
-- LogPurple("curHeroData.heroConfig.profession"..curHeroData.heroConfig.Profession)
-- LogYellow(GetHeroPosStr(curHeroData.heroConfig.Profession))

View File

@ -150,7 +150,7 @@ function this.GetTailsmanPassivePower1(_heroData)
if passiveSkillConfig[SingleProVal[i]] then
local config = passiveSkillConfig[SingleProVal[i]]
if config.FitList[1] == 0 or
(config.FitList[1] == 1 and heroConfig[_heroData.tId].PropertyName == config.FitList[2]) or
(config.FitList[1] == 1 and _heroData.zhenYingId == config.FitList[2]) or
(config.FitList[1] == 2 and heroConfig[_heroData.tId].Profession == config.FitList[2]) then
for i = 1,#config.SkillId do
table.insert(idList,config.SkillId[i])

View File

@ -574,7 +574,7 @@ function this.SetTeamInfo(_go,teamData,type)
SetHeroStars(this.spLoader, teamList[hero.position].starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(teamList[hero.position].starGrid,this.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
teamList[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
teamList[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
teamList[hero.position].levelText.text = hero.level
teamList[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(this.spLoader, hero,teamList[hero.position].icon,heroConfig)

View File

@ -180,7 +180,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
SetHeroFlyEffect(self.Heros[index][hero.position].hero,self.spLoader,heroData.star,self.sortingOrder+1,0.9,2)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
allPower=allPower+heroData.warPower
self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
self.Heros[index][hero.position].levelText.text = heroData.lv
self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig)

View File

@ -232,7 +232,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
SetHeroStars(self.spLoader, self.teamList[index].heroList[hero.position].starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(self.teamList[index].heroList[hero.position].starGrid,self.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
self.teamList[index].heroList[hero.position].levelText.text = hero.level
self.teamList[index].heroList[hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(self.spLoader,hero, self.teamList[index].heroList[hero.position].icon,heroConfig)

View File

@ -76,8 +76,8 @@ function ElementalResonanceView:GetElementalType(curFormation, type)
for i, v in pairs(curFormation) do
local data = HeroManager.GetSingleHeroData(v.heroId)
self.heroPropertyType = data.heroConfig.PropertyName
LogGreen("data.heroConfig.PropertyName:"..tostring(data.heroConfig.PropertyName))
self.heroPropertyType = data.changeProId
LogGreen("data.changeProId:"..tostring(data.changeProId))
table.insert(elementPropertyList, self.heroPropertyType)
end
self.dataTable.title = Language[12021]

View File

@ -68,7 +68,7 @@ function FourTrailSingleHelpHero:OnShow(curType,...)
self.frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
self.icon:GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon)
self.lv:GetComponent("Text").text = heroData.lv
self.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
self.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
local star,starType = heroData.GetStar(1)
SetHeroStars(self.spLoader,self.starGrid , star,starType)
SetHeroFlyEffect(self.hero,self.spLoader,heroData.star,self.sortingOrder+1,1 )

View File

@ -165,7 +165,7 @@ function HarmonyView:SetItem(data,go,flag)
go.lv.text = string.format("<color=#0f0>%d</color>",data.lv)
end
go.icon.sprite = self.spLoader:LoadSprite(data.icon)
go.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.heroConfig.PropertyName))
go.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.changeProId))
local star,starType = data.GetStar(1)
SetHeroStars(self.spLoader, go.starGrid, star,starType,nil,nil,Vector2.New(0,1))
SetHeroFlyEffect(go.infoGo,self.spLoader,data.star,self.sortingOrder+1,1.2,0)

View File

@ -75,7 +75,7 @@ function RoleItemView:OnShowHeroData(effectLayer)
--SetHEeroLiveToward(self.icon.gameObject,self.heroData.heroConfig.Toward )
self.lv.text=self.heroData.lv
-- self.pos.sprite=this.spLoader:LoadSprite(self.heroData.professionIcon)
self.pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(self.heroData.heroConfig.PropertyName))
self.pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(self.heroData.changeProId))
self.heroStageImage.sprite=this.spLoader:LoadSprite(HeroStageSprite[self.heroData.heroConfig.HeroStage])
self.roleEffect:SetActive(self.heroData.star >= 5)--
Util.AddParticleSortLayer(self.roleEffect, effectLayer - self.EffectOrginLayer)