法宝之魂 提交

dev_chengFeng
jiaoyangna 2021-11-16 15:24:17 +08:00
parent aa6a031fdf
commit 1e4a7a57be
18 changed files with 4573 additions and 4097 deletions

View File

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

View File

@ -4809,12 +4809,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 788618541235343804}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 3
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -107, y: -100}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4655910079569053905
@ -9726,7 +9726,7 @@ RectTransform:
- {fileID: 647030188288427237}
- {fileID: 2537661423143505680}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 6
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -19926,6 +19926,83 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!1 &1993534040704324790
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 161672366053446771}
- component: {fileID: 4961706857348061968}
- component: {fileID: 5176188907258680526}
m_Layer: 0
m_Name: leftGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &161672366053446771
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1993534040704324790}
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: 7451155351264481488}
- {fileID: 2460104060231984465}
- {fileID: 7028779672763907709}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 39.5, y: 635}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &4961706857348061968
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1993534040704324790}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
m_Spacing: 31.5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &5176188907258680526
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1993534040704324790}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &2057703987632965940
GameObject:
m_ObjectHideFlags: 0
@ -20526,14 +20603,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3759887136319108211}
m_Father: {fileID: 161672366053446771}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 104, y: -263.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5380132395739986605
CanvasRenderer:
m_ObjectHideFlags: 0
@ -36441,15 +36518,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7451155351264481488}
- {fileID: 2460104060231984465}
- {fileID: 7028779672763907709}
- {fileID: 731194827031997369}
- {fileID: 5425594471415034572}
- {fileID: 2104297696566059952}
- {fileID: 5901742240670988321}
- {fileID: 3359803177079758621}
- {fileID: 8834495025878721902}
- {fileID: 5901742240670988321}
- {fileID: 161672366053446771}
- {fileID: 6857431349622417075}
m_Father: {fileID: 8503549196898394800}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -36792,12 +36864,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8497496980748765707}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 4
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -107, y: -260}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5983553501615161877
@ -37074,6 +37146,84 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 60
--- !u!1 &6185349028705534137
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6857431349622417075}
- component: {fileID: 1358751446755459863}
- component: {fileID: 7324316433029491268}
m_Layer: 0
m_Name: rightGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6857431349622417075
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6185349028705534137}
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: 8834495025878721902}
- {fileID: 2104297696566059952}
- {fileID: 731194827031997369}
- {fileID: 5425594471415034572}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 908.5, y: 635}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1358751446755459863
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6185349028705534137}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
m_Spacing: 23.2
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &7324316433029491268
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6185349028705534137}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &6352690128292113717
GameObject:
m_ObjectHideFlags: 0
@ -56223,14 +56373,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3759887136319108211}
m_Father: {fileID: 161672366053446771}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 104, y: -100}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 130, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0}
--- !u!222 &2933242268949778339
CanvasRenderer:
m_ObjectHideFlags: 0
@ -57190,12 +57340,12 @@ RectTransform:
m_Children:
- {fileID: 7029056200395171643}
- {fileID: 8687714314605843872}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 5
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -106, y: 60}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4606777694015441894
@ -57458,7 +57608,7 @@ RectTransform:
m_Children:
- {fileID: 6022124996116502175}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 7
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -67694,14 +67844,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1037405534564376616}
m_Father: {fileID: 3759887136319108211}
m_Father: {fileID: 161672366053446771}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 104, y: 60}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 130, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0}
--- !u!222 &6630734786510165914
CanvasRenderer:
m_ObjectHideFlags: 0
@ -68110,12 +68260,12 @@ RectTransform:
m_Children:
- {fileID: 2515134631909214660}
- {fileID: 4945657128760505677}
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 8
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -106, y: 226}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2371125510953333917

View File

@ -677,7 +677,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0.0000048667753, y: 50}
m_AnchoredPosition: {x: -0.000019012785, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -852,6 +852,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3011268865113292670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5267998214490384126}
- component: {fileID: 8416463428273338253}
- component: {fileID: 6899776982516978443}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5267998214490384126
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3011268865113292670}
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: 6788551056416428698}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -166, y: 1.85}
m_SizeDelta: {x: 302.3, y: 302.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8416463428273338253
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3011268865113292670}
m_CullTransparentMesh: 0
--- !u!114 &6899776982516978443
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3011268865113292670}
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: 0}
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 &3143221817415761140
GameObject:
m_ObjectHideFlags: 0
@ -1550,6 +1624,7 @@ RectTransform:
m_Children:
- {fileID: 3092850759758360225}
- {fileID: 4677430472340796669}
- {fileID: 5267998214490384126}
- {fileID: 4336398015624501059}
m_Father: {fileID: 7480441870429284241}
m_RootOrder: 0
@ -1773,7 +1848,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_TargetGraphic: {fileID: 671000956049144762}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -3090,7 +3165,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -1053,6 +1053,7 @@ MonoBehaviour:
- Assets/ManagedResources/~Lua/Modules/Harmony/Panel
- Assets/ManagedResources/~Lua/Modules/Harmony/View
- Assets/ManagedResources/~Lua/Modules/Hero
- Assets/ManagedResources/~Lua/Modules/Incarnation
- Assets/ManagedResources/~Lua/Modules/JourneyWithWind
- Assets/ManagedResources/~Lua/Modules/JumpServer
- Assets/ManagedResources/~Lua/Modules/Likability
@ -1115,6 +1116,7 @@ MonoBehaviour:
- Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology
- Assets/ManagedResources/~Lua/Modules/Story
- Assets/ManagedResources/~Lua/Modules/SurpriseBox
- Assets/ManagedResources/~Lua/Modules/TailsManSoul
- Assets/ManagedResources/~Lua/Modules/Task
- Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao
- Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang
@ -57332,6 +57334,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 695
resAbNameIndex: 3170
- resName: TailsmanSoulMainPanel
extension: .prefab
resPathIndex: 695
resAbNameIndex: 3170
- resName: LingLongBaoJingPanel
extension: .prefab
resPathIndex: 696
@ -58220,6 +58226,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 751
resAbNameIndex: 3220
- resName: TailsManSouPanel
extension: .prefab
resPathIndex: 752
resAbNameIndex: 3221
- resName: TianShuMiJuanMainPanel
extension: .prefab
resPathIndex: 752
@ -76511,6 +76521,7 @@ MonoBehaviour:
- lz4/dynamicatlas/commonatlas/z_zhandou_lvxuetiao_01.unity3d
- lz4/dynamicatlas/commonatlas/z_zhandou_lvxuetiao_02.unity3d
- lz4/dynamicatlas/commonatlas/z_zhandou_yichuhuolan 1.unity3d
- lz4/dynamicatlas/d_dhxx_di 1.unity3d
- lz4/dynamicatlas/formationatlas/bd_biao1.unity3d
- lz4/dynamicatlas/r_hero_tiao.unity3d
- lz4/dynamicatlas/r_hero_yuansukuang.unity3d
@ -78306,12 +78317,17 @@ MonoBehaviour:
- assetBundleName: lz4/prefabs/ui/tianshumijuan.unity3d
dependences:
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/tagbuttonatlas.unity3d
- lz4/atlas/tianshumijuanatlas.unity3d
- lz4/dynamicatlas/commonatlas/r_guanka_jindutiao001.unity3d
- lz4/dynamicatlas/commonatlas/r_guanka_jindutiao002.unity3d
- lz4/dynamicatlas/fetteritemviewatlas/t_tianshumijuan_mingzidi.unity3d
- lz4/dynamicatlas/r_tongyong_xiaanniu_di.unity3d
- lz4/dynamicatlas/t_tianshumijuan_dizi.unity3d
- lz4/dynamicatlas/t_tianshumijuan_hunyinditu.unity3d
- lz4/dynamicatlas/t_tianshumijuan_mutianheng.unity3d
- lz4/dynamicatlas/t_tianshumijuan_shanghengtiaodi.unity3d
- lz4/dynamicatlas/t_tianshumijuan_xiaoditouming.unity3d
- lz4/dynamicatlas/t_tianshumijuan_youcecuzhu.unity3d
- lz4/dynamicatlas/t_tianshumijuan_zuibianshangzhu.unity3d
- lz4/fonts/fzjinls.unity3d

View File

@ -1046,6 +1046,7 @@ ItemType = {
heroDogFood =25,--英雄狗粮
linglongbaojingkaimen = 26,
likeabilityItem = 27,
Incarnation = 28,
}
JumpType = {
Lottery = 1, --招募
@ -1576,7 +1577,7 @@ FUNCTION_OPEN_TYPE = {
PLAYER_SKILL = 115, --主角技能
shenhun = 116,
WEEK_CARD = 117, -- 周卡
TailsmanSoul = 118
TailsmanSoul = 119,
}
TaskGetBtnIconDef = {
@ -1799,6 +1800,7 @@ HELP_TYPE = {
shenhun =113,
DemonSlayerNew=114,--新三界除魔
WeekCard=115,--周卡
tailsmainSoul = 117,
}
NumToComplexFont = {
@ -3027,14 +3029,21 @@ GetTailsmanCardStarImage = {
[7] = "r_tongyong_duiwudizhuanshi",
}
GetTailsmanStarImage = {
[5] = "ui_1xing",
[6] = "ui_1yue",
[7] = "t_zhandoukuang_zhuangshixx",
GetTailsmanBgStarImage = {
[5] = "r_tongyong_jinse",
[6] = "r_tongyong_hongse",
[7] = "r_tongyong_zhuanshi",
}
GetTailsmanDiImage = {
[5] = "ui_1xing",
[6] = "ui_1yue",
[7] = "t_zhandoukuang_zhuangshixx",
}
GetTailsmanSoulDiImage = {
[5] = "r_tongyong_duiwudi",
[6] = "r_tongyong_duiwudihong",
[7] = "r_tongyong_duiwudizhuanshi",
}

View File

@ -1555,13 +1555,21 @@ end
--- 根据id获取资源
function GetResourcePath(id)
return GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, id).Name)
local config = ConfigManager.TryGetConfigData(ConfigName.ArtResourcesConfig, id)
if config then
return GetLanguageStrById(config.Name)
end
return "r_shijie_tili"
end
--- 根据ItemId获取资源名称
function GetSpriteNameByItemId(id)
local artId = ConfigManager.GetConfigData(ConfigName.ItemConfig, id).ResourceID
return GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, artId).Name)
local config = ConfigManager.TryGetConfigData(ConfigName.ArtResourcesConfig, artId)
if config then
return GetLanguageStrById(config.Name)
end
return "r_shijie_tili"
end
--- 获取玩家头像资源

View File

@ -90,6 +90,9 @@ function this.UpDataBagItemIdNumber(_itemData)
CheckRedPointStatus(RedPointType.Recruit_Normal)
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
CheckRedPointStatus(RedPointType.Recruit_Friend)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
end
--后端刷新
@ -107,6 +110,9 @@ function this.BackDataRefreshEnerny(msgItemInfo)
CheckRedPointStatus(RedPointType.Recruit_Normal)
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
CheckRedPointStatus(RedPointType.Recruit_Friend)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
end
end
@ -597,6 +603,9 @@ function this.GoIntoBackData(drop)
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
CheckRedPointStatus(RedPointType.Recruit_Friend)
CheckRedPointStatus(RedPointType.Sacred)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
end
if (#drop.equipId > 0) then
for i = 1, #drop.equipId do
@ -687,6 +696,9 @@ function this.GetTableByBackDropData(drop)
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
CheckRedPointStatus(RedPointType.Recruit_Friend)
CheckRedPointStatus(RedPointType.Sacred)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
end
if drop.equipId ~= nil and #drop.equipId > 0 then
for i = 1, #drop.equipId do
@ -1118,7 +1130,9 @@ function this.BagIndicationRefresh(msg)
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
CheckRedPointStatus(RedPointType.Recruit_Friend)
CheckRedPointStatus(RedPointType.Sacred)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
-- 超出最大数量限制提示
if msg.isMax and msg.isMax == 1 then
PopupTipPanel.ShowTip(Language[10169])

View File

@ -108,7 +108,7 @@ function this.InitMsg(msg)
this.serData[id].restTime = restTime
this.serData[id].switch = switch
-- LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
-- 用于标记是否解锁使用
local typeId = AllActSetConfig[id].IsIDdSame

View File

@ -15,6 +15,7 @@ Func_Prop_Type = {
LikeAbility = 12, -- 好感度
EquipFetter = 13, -- 白金装备羁绊
Cultivation = 14, -- 主角修为
TailsManSou = 15, -- 法宝之魂
}
-- 计算需要缓存数据的方法
@ -96,6 +97,11 @@ Func_Prop_Func = {
local allPro = PracticeManager.GetCultivationPros()
return allPro
end,
-- 法宝之魂
[Func_Prop_Type.TailsManSou] = function()
local allPro = TailsManSoulManager.GetTailsmanTotalPro()
return allPro
end,
}
@ -165,4 +171,8 @@ Func_Prop_Filter = {
[Func_Prop_Type.Cultivation] = function(funcData, heroData)
return funcData
end,
-- 法宝之魂
[Func_Prop_Type.TailsManSou] = function(funcData, heroData)
return funcData
end,
}

View File

@ -19,6 +19,7 @@ Hero_Prop_Type = {
SkinAdd = 7, -- 皮肤
LikeAbility = 8, -- 好感度
GodSoul = 9, -- 神魂
TailsManSou = 10, -- 法宝之魂
}
@ -512,4 +513,14 @@ Hero_Prop_Func = {
end
return propList, conPropList, teamPropList, conTeamPropList, dePropList
end,
[Hero_Prop_Type.TailsManSou] = function(_heroData)
local propList, conPropList, teamPropList, conTeamPropList, dePropList
local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower()
if SingleProVal and #SingleProVal > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
--单体加成 --单体等级限制加成 --团体加成 --减乘
propList, conPropList, teamPropList, conTeamPropList, dePropList = PassiveListToPropList(SingleProVal)
end
return propList, conPropList, teamPropList, conTeamPropList, dePropList
end,
}

View File

@ -1,12 +1,66 @@
IncarnationManager = {}
local this = IncarnationManager
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
this.itemDataList = {} --state -1 未拥有 0 已有未激活 1激活未上阵 2上阵
function this.Initialize()
this.InitializeTableData()
this.InitItemDataList()
end
function this.InitializeTableData()
function this.InitItemDataList()
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig,"Type",ItemType.Incarnation)
for i = 1,#configs do
this.CreatEmptyItemData(configs[i].Id)
end
end
function this.CreatEmptyItemData(id)
if not this.itemDataList[id] then
this.itemDataList[id] = {}
this.itemDataList[id].itemId = id
this.itemDataList[id].state = -1
this.itemDataList[id].property = itemConfig[id].PropertyName
end
end
function this.SetItemDataList(dataList)
for i = 1,#dataList do
this.SetItemDataByid(dataList[i].id,dataList[i].state)
end
end
function this.SetItemDataByid(id,state)
if not this.itemDataList[id] then
this.CreatEmptyItemData(id)
end
this.itemDataList[id].state = state
end
--根据属性获取化身数据
function this.GetItemDataListByPro(property)
local datas = {}
for k,v in pairs(this.itemDataList) do
if v.property == property then
table.insert(datas,v)
end
end
return datas
end
function this.GetPropertyData()
end
--获取已上阵的变身卡
function this.GetIncarnationData()
local datas = {}
for k,v in pairs(this.itemDataList) do
if v.state == 2 then
table.insert(datas,v.Id)
end
end
return datas
end
return this

View File

@ -6078,7 +6078,6 @@ function NetManager.GetWeekCardReward(id, func)
end)
end
-- 请求领取周卡奖励
function NetManager.FaBaoSoulUpLvRequest(id,lv, func)
local data = HeroInfoProto_pb.FaBaoSoulUpLvRequest()
data.id = id
@ -6086,6 +6085,11 @@ function NetManager.FaBaoSoulUpLvRequest(id,lv, func)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.FA_BAO_SOUL_UPLV_REQUEST, MessageTypeProto_pb.FA_BAO_SOUL_UPLV_RESPONSE, msg, function(buffer)
TailsManSoulManager.SetTailsmanLvById(id,lv)
CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
CheckRedPointStatus(RedPointType.tailsmanSoul_red)
CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
if func then
func(msg)
end

View File

@ -616,6 +616,10 @@ function this.RegisterRedCheckFunc()
-- 周卡
RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen, FUNCTION_OPEN_TYPE.WEEK_CARD)
RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward, FUNCTION_OPEN_TYPE.WEEK_CARD)
RPData:AddCheckFunc(RedPointType.tailsmanSoul_gold,TailsManSoulManager.CheckRedData)
RPData:AddCheckFunc(RedPointType.tailsmanSoul_red,TailsManSoulManager.CheckRedData)
RPData:AddCheckFunc(RedPointType.tailsmanSoul_whiteGold,TailsManSoulManager.CheckRedData)
end
-- 向红点绑定物体

View File

@ -18,21 +18,21 @@ function Practice:InitComponent()
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
--Btns
self.helpBtn = Util.GetGameObject(self.gameObject, "Btns/helpBtn")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.previewBtn = Util.GetGameObject(self.gameObject, "Btns/previewBtn")
self.additionBtn = Util.GetGameObject(self.gameObject, "Btns/additionBtn")
self.imprintBtn = Util.GetGameObject(self.gameObject, "Btns/imprintBtn")
self.imprintRedPoint = Util.GetGameObject(self.imprintBtn, "redPoint")
self.fourQuadrantBtn = Util.GetGameObject(self.gameObject, "Btns/yushenBtn")
self.fourQuadrantRedPoint = Util.GetGameObject(self.fourQuadrantBtn, "redPoint")
self.starBtn = Util.GetGameObject(self.gameObject, "Btns/starBtn")
self.starNum = Util.GetGameObject(self.starBtn, "starNum"):GetComponent("Text")
self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/treeBtn")
self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint")
self.cultivationBtn = Util.GetGameObject(self.gameObject, "Btns/cultivationBtn")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.previewBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/previewBtn")
self.additionBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/additionBtn")
self.cultivationBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/cultivationBtn")
self.cultivationRed = Util.GetGameObject(self.cultivationBtn, "redPoint")
self.talsmanSoulBtn = Util.GetGameObject(self.gameObject, "Btns/talsmanSoulBtm")
self.imprintBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/imprintBtn")
self.imprintRedPoint = Util.GetGameObject(self.imprintBtn, "redPoint")
self.fourQuadrantBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/yushenBtn")
self.fourQuadrantRedPoint = Util.GetGameObject(self.fourQuadrantBtn, "redPoint")
self.starNum = Util.GetGameObject(self.starBtn, "starNum"):GetComponent("Text")
self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/treeBtn")
self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint")
self.talsmanSoulBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/talsmanSoulBtm")
self.talsmanSoulBtnRed = Util.GetGameObject(self.talsmanSoulBtn, "redPoint")
--MidPart
@ -379,7 +379,7 @@ function Practice:RefreshBtn()
Util.SetGray(self.imprintBtn,PracticeManager.PracticeBigLevel < 2)
Util.SetGray(self.fourQuadrantBtn,PlayerManager.level < globalSystemConfig.OpenRules[2])
self.fourQuadrantBtn:SetActive(globalSystemConfig.IsOpen==1)
--self.talsmanSoulBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
self.talsmanSoulBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
self.noOpenTip:SetActive(false)
if XinXianConfig[PracticeManager.PracticeLevel + 1] then
self.button:SetActive(true)

View File

@ -7,16 +7,16 @@ local TabBox = require("Modules/Common/TabBox")
local tabs = {
[1] = { --金色
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "金色",
rpType = -1,bg = "t_tianshumijuan_shengjiangditu",quality = 5
rpType = RedPointType.tailsmanSoul_gold,bg = "t_tianshumijuan_shengjiangditu",quality = 5
},
[2] = { --红色
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "红色",
rpType = -1,bg = "t_tianshumijuan_hunyinditu",quality = 6
},
[3] = { --白金
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "白金",
rpType = -1,bg = "t_tianshumijuan_lingshouditu",quality = 7
rpType = RedPointType.tailsmanSoul_red,bg = "t_tianshumijuan_hunyinditu",quality = 6
},
-- [3] = { --白金
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "白金",
-- rpType = RedPointType.tailsmanSoul_whiteGold,bg = "t_tianshumijuan_lingshouditu",quality = 7
-- },
}
local curData = {}
local curPage = 1
@ -33,6 +33,7 @@ function TailsManSouPanel:InitComponent()
local v21 = grid.transform.rect
self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,25))
self.empty = Util.GetGameObject(self.gameObject,"bg/NoneImage")
self.addBtn = Util.GetGameObject(self.gameObject,"bg/add")
end
--绑定事件(用于子类重写)
@ -40,6 +41,9 @@ function TailsManSouPanel:BindEvent()
Util.AddClick(self.btnBack, function()
self:ClosePanel()
end)
Util.AddClick(self.addBtn, function()
UIManager.OpenPanel(UIName.RoleProInfoPopup,TailsManSoulManager.GetTailsmanTotalPro(),nil,false,nil)
end)
self.tabBox = TabBox.New()
self.tabBox:SetTabAdapter(self.SetTabAdapter)
self.tabBox:SetTabIsLockCheck(self.TabIsLockCheck)
@ -91,12 +95,11 @@ end
function TailsManSouPanel:OnOpen(...)
local args = {...}
curPage = args[1] or 1
LogGreen("curPage:"..tostring(curPage))
self.tabBox:Init(self.tabbox.gameObject, tabs, curPage)
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function TailsManSouPanel:OnShow(...)
function TailsManSouPanel:OnShow()
self.bg.sprite = this.spLoader:LoadSprite(tabs[curPage].bg)
curData = TailsManSoulManager.GetTailsmanSoulDatas(tabs[curPage].quality)
self:RefreshData()
@ -130,25 +133,27 @@ function TailsManSouPanel:SetSingleData(go,data,index)
self.itemPreList[go] = {}
self.itemPreList[go].obj = Util.GetGameObject(go,"go")
self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image")
self.nameText = Util.GetGameObject(self.itemPreList[go].obj,"bg/nameDi/nameText"):GetComponent("Text")
self.slider = Util.GetGameObject(self.itemPreList[go].obj,"slider"):GetComponent("Slider")
self.tip = Util.GetGameObject(self.slider.transform,"tip"):GetComponent("Text")
self.progress = Util.GetGameObject(self.slider.transform,"progress"):GetComponent("Text")
self.red = Util.GetGameObject(self.itemPreList[go].bg.transform,"red")
self.itemPreList[go].nameText = Util.GetGameObject(self.itemPreList[go].obj,"bg/nameDi/nameText"):GetComponent("Text")
self.itemPreList[go].slider = Util.GetGameObject(self.itemPreList[go].obj,"bg/slider"):GetComponent("Slider")
self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].slider.transform,"tip"):GetComponent("Text")
self.itemPreList[go].progress = Util.GetGameObject(self.itemPreList[go].slider.transform,"progress"):GetComponent("Text")
self.itemPreList[go].red = Util.GetGameObject(self.itemPreList[go].bg.transform,"red")
self.itemPreList[go].icon = Util.GetGameObject(self.itemPreList[go].bg.transform,"icon"):GetComponent("Image")
end
self.itemPreList[go].data = data
if not data then
go.gameObject:SetActive(false)
return
end
self.red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList))
go.gameObject:SetActive(true)
self.itemPreList[go].bg.sprite = this.spLoader:LoadSprite(self.itemPreList[go].data.icon)
self.nameText.text = self.itemPreList[go].data.name
self.slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv
self.progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv
self.itemPreList[go].bg.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality])
self.itemPreList[go].nameText.text = self.itemPreList[go].data.name
self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv
self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv
self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList))
self.itemPreList[go].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(self.itemPreList[go].data.icon))
Util.AddOnceClick(go,function()
UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id)
UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id)
end)
end

View File

@ -19,6 +19,7 @@ function this.GetTailsmanSoulDatas(qua)
singBookData.icon = v.Icon
singBookData.quality = v.Quality
singBookData.trumpList,singBookData.maxLv,singBookData.lv,singBookData.skillList = this.GetTailsmanSoulDataById(singBookData.id)
singBookData.skillConfig = v.SkillList
table.insert(datas,singBookData)
end
end
@ -61,6 +62,7 @@ function this.SetTailsmanLv(data)
for i = 1,#data do
this.SetTailsmanLvById(data[i].id,data[i].level)
end
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
end
--根据法宝id 获取设置等级
@ -94,7 +96,16 @@ function this.GetTailsmanCost(id,lv)
end
function this.GetTailsmanPassivePower()
local passiveList = {}
local datas = this.GetTailsmanSoulDatas()
local data = {}
for i = 1,#datas do
for j = 1,#datas[i].skillConfig do
if datas[i].lv <= datas[i].skillConfig[j][1] then
table.insert(data,datas[i].skillConfig[j][2])
end
end
end
return data
end
function this.CheckRedData(red)

View File

@ -45,9 +45,10 @@ function TailsmanSoulMainPanel:InitComponent()
self.skillPro = Util.GetGameObject(self.transform, "skillLayout/pro")
self.skillGrid = Util.GetGameObject(self.transform, "skillLayout/proScrolllRect/proScroll")
self.skillGridPos = self.skillGrid:GetComponent("RectTransform").anchoredPosition3D
self.skillList = {}
end
function TailsmanSoulMainPanel:BindEvent()
Util.AddClick(self.btnBack, function()
self:ClosePanel()
@ -63,14 +64,24 @@ function TailsmanSoulMainPanel:BindEvent()
local isEnough = false,false
if num and num > 0 then
if curNum >= num then
local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.FaBaoSoulUpLvRequest(self.data.id,self.data.lv + 1, function()
self:OnShow()
if self.data.lv < 2 then
PopupTipPanel.ShowTip(string.format("%s激活成功",self.data.config.Name))
else
PopupTipPanel.ShowTip(string.format("%s强化成功",self.data.config.Name))
end
local newPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if newPower - oldPower > 0 then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldPower,newValue = newPower})
end
end)
else
PopupTipPanel.ShowTip(string.format("%s不足",ItemConfig[costId].Name))
end
else
PopupTipPanel.ShowTip("已达最高等级")
PopupTipPanel.ShowTip("已达上限")
end
end)
end
@ -100,17 +111,32 @@ function TailsmanSoulMainPanel:OnShow()
self:SetTailsManList(self.trumpList,self.tailsGrid,self.tailsPre)
self:ChangeTailsMan()
local data1 = self:GetSkillDataList(self.skillDataList)
self:SetProList(self.skillDataList,self.skillList,self.skillGrid,self.skillPro)
self:SetProList(data1,self.skillList,self.skillGrid,self.skillPro)
self:SetSkillGridPos(data1)
end
function TailsmanSoulMainPanel:SetSkillGridPos()
local pos = self.skillGrid:GetComponent("RectTransform").anchoredPosition3D
for i = 1,#self.skillList do
if self.complv > i then
pos.y = self.skillGridPos.y + GetPreferredHeight(self.skillList[i].go.transform)
end
end
self.skillGrid:GetComponent("RectTransform").anchoredPosition3D = pos
end
function TailsmanSoulMainPanel:GetSkillDataList()
for k,v in pairs(self.skillDataList) do
if self.complv < k then
v = string.format("<color=#FFCF9E>%s</color>",v)
local datas = {}
for k,v in pairs(self.skillDataList) do
local str = v
if self.complv >= k then
str = string.format("<color=#00FF00>%s</color>",str)
else
v = string.format("<color=#00FF00>%s</color>",v)
str = string.format("<color=#FFCF9E>%s</color>",str)
end
datas[k] = str
end
return datas
end
function TailsmanSoulMainPanel:ChangeTailsMan()
@ -123,13 +149,14 @@ function TailsmanSoulMainPanel:ChangeTailsMan()
self:SetCostItem()
self:SetStar(self.starGray,self.data.config.Quality)
self:SetStar(self.starLight,self.data.lv)
end
function TailsmanSoulMainPanel:GetProData()
local proData = {}
local curData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",self.data.config.LvupPool,"Level",self.data.lv).LvupProps
local nextProData = {}
local tempdata = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",self.data.config.LvupPool,"Level",self.data.lv + 1)
local tempdata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",self.data.config.LvupPool,"Level",self.data.lv + 1)
local isMax = 0
if not tempdata then
isMax = 1
@ -179,7 +206,8 @@ function TailsmanSoulMainPanel:SetCostItem()
local costId,num = TailsManSoulManager.GetTailsmanCost(self.data.id,self.data.lv)
local curNum = BagManager.GetItemCountById(costId)
local colo = curNum >= num and "#FF0000" or "#FFCF9E"
if num and num > 0 then
if num and num > 0 then
self.costIcon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(costId))
self.costIcon.gameObject:SetActive(true)
self.costNum.text = string.format("<color=#%s>%s/%s</color>",colo,curNum,num)
if curNum > num then
@ -187,10 +215,12 @@ function TailsmanSoulMainPanel:SetCostItem()
else
self.upLvBtnRed.gameObject:SetActive(false)
end
Util.SetGray(self.upLvBtn,false)
else
self.upLvBtnRed.gameObject:SetActive(false)
self.costIcon.gameObject:SetActive(false)
self.costNum.text = "已达最高等级"
self.costNum.text = "已达上限"
Util.SetGray(self.upLvBtn,true)
end
if self.data.lv < 1 then
self.upLvBtnText.text = "激活"
@ -223,7 +253,7 @@ function TailsmanSoulMainPanel:SetTailsManList(data,grid,pre)
end
self.tailsList[i].go.gameObject:SetActive(true)
self.tailsList[i].card.sprite = self.spLoader:LoadSprite(GetTailsmanCardStarImage[data[i].config.Quality])
self.tailsList[i].bg.sprite = self.spLoader:LoadSprite(GetTailsmanStarImage[data[i].config.Quality])
self.tailsList[i].bg.sprite = self.spLoader:LoadSprite(GetTailsmanBgStarImage[data[i].config.Quality])
self.tailsList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(data[i].config.Icon))
self.tailsList[i].name.text = data[i].config.Name
self:SetStar(self.tailsList[i].starGray,data[i].config.Quality)