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

dev_chengFeng
ZhangBiao 2021-07-29 15:03:54 +08:00
commit c6598ecff4
9 changed files with 587 additions and 355 deletions

View File

@ -904,6 +904,78 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5F00\u59CB\u6218\u6597"
LanguageIndex: 10737
--- !u!1 &1083349738609789543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6323197237469010760}
- component: {fileID: 4491216835835075825}
- component: {fileID: 5302338523085281390}
m_Layer: 5
m_Name: CurGuild
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6323197237469010760
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083349738609789543}
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: 7810330876086863043}
- {fileID: 1355317543462800902}
- {fileID: 9140136421066172111}
- {fileID: 8546717955000265283}
m_Father: {fileID: 9179711840133666567}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 146.1001, y: -107.200195}
m_SizeDelta: {x: 234, y: 142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4491216835835075825
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083349738609789543}
m_CullTransparentMesh: 0
--- !u!114 &5302338523085281390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083349738609789543}
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: -28
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &1128473439091638925
GameObject:
m_ObjectHideFlags: 0
@ -1298,6 +1370,202 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1917452169955659514
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1355317543462800902}
- component: {fileID: 3708197088373814868}
- component: {fileID: 4385410806696788995}
- component: {fileID: 8812250238046967593}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1355317543462800902
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917452169955659514}
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: 6323197237469010760}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000030518, y: 34.4}
m_SizeDelta: {x: 234, y: 55.85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3708197088373814868
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917452169955659514}
m_CullTransparentMesh: 0
--- !u!114 &4385410806696788995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917452169955659514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7490196, g: 0.6509804, b: 0.47843137, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 33
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 33
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u5360\u636E\u516C\u4F1A\n"
LanguageIndex: 10734
--- !u!114 &8812250238046967593
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1917452169955659514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &1926112178402089508
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7810330876086863043}
- component: {fileID: 9069155550712328013}
- component: {fileID: 89155574507424505}
- component: {fileID: 7405444516361111515}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7810330876086863043
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1926112178402089508}
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: 6323197237469010760}
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: 234, y: 142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9069155550712328013
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1926112178402089508}
m_CullTransparentMesh: 0
--- !u!114 &89155574507424505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1926112178402089508}
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: a3460d70744324e46aa7b1e955de67a6, 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 &7405444516361111515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1926112178402089508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &1935795473689970344
GameObject:
m_ObjectHideFlags: 0
@ -1533,6 +1801,164 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2115224315743209086
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9140136421066172111}
- component: {fileID: 8986993927247768327}
- component: {fileID: 1385468981205018304}
m_Layer: 5
m_Name: Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9140136421066172111
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2115224315743209086}
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: 6323197237469010760}
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: 0, y: 0}
m_SizeDelta: {x: 234, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8986993927247768327
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2115224315743209086}
m_CullTransparentMesh: 0
--- !u!114 &1385468981205018304
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2115224315743209086}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.92156863, g: 0.67058825, b: 0.40392157, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 36
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u65E0"
--- !u!1 &2455057895480365492
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8546717955000265283}
- component: {fileID: 1355106025873678680}
- component: {fileID: 1787802860903658198}
m_Layer: 5
m_Name: serverName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8546717955000265283
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2455057895480365492}
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: 6323197237469010760}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 117, y: -104.5}
m_SizeDelta: {x: 234, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1355106025873678680
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2455057895480365492}
m_CullTransparentMesh: 0
--- !u!114 &1787802860903658198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2455057895480365492}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.92156863, g: 0.67058825, b: 0.40392157, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 100
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u65E0"
--- !u!1 &2747287186639573217
GameObject:
m_ObjectHideFlags: 0
@ -2020,7 +2446,7 @@ RectTransform:
m_Children:
- {fileID: 2854477637607175488}
- {fileID: 7949717828043330433}
- {fileID: 7979535109383820488}
- {fileID: 6323197237469010760}
- {fileID: 7830899854231050988}
- {fileID: 1990439202584743595}
- {fileID: 8082431718913310779}
@ -2852,86 +3278,6 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5785729822597292644
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3655836363088972473}
- component: {fileID: 776940781777187897}
- component: {fileID: 1810751793888809937}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3655836363088972473
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785729822597292644}
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: 7979535109383820488}
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.000030518, y: 34.4}
m_SizeDelta: {x: 234, y: 55.85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &776940781777187897
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785729822597292644}
m_CullTransparentMesh: 0
--- !u!114 &1810751793888809937
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5785729822597292644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7490196, g: 0.6509804, b: 0.47843137, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 33
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 33
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u5360\u636E\u516C\u4F1A\n"
LanguageIndex: 10734
--- !u!1 &5932247005023236108
GameObject:
m_ObjectHideFlags: 0
@ -3361,82 +3707,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6245040221529314428
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7979535109383820488}
- component: {fileID: 1407864590344040603}
- component: {fileID: 4175441231884047503}
m_Layer: 5
m_Name: CurGuild
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7979535109383820488
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6245040221529314428}
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: 3655836363088972473}
- {fileID: 3602576821442421686}
m_Father: {fileID: 9179711840133666567}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 146.1001, y: -107.200195}
m_SizeDelta: {x: 234, y: 142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1407864590344040603
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6245040221529314428}
m_CullTransparentMesh: 0
--- !u!114 &4175441231884047503
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6245040221529314428}
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: a3460d70744324e46aa7b1e955de67a6, 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 &6251372281959020597
GameObject:
m_ObjectHideFlags: 0
@ -3993,85 +4263,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7385264792202716888
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3602576821442421686}
- component: {fileID: 3246567987664098557}
- component: {fileID: 9044254595493434807}
m_Layer: 5
m_Name: Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3602576821442421686
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7385264792202716888}
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: 7979535109383820488}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000012398, y: -10}
m_SizeDelta: {x: 234, y: 77.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3246567987664098557
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7385264792202716888}
m_CullTransparentMesh: 0
--- !u!114 &9044254595493434807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7385264792202716888}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.92156863, g: 0.67058825, b: 0.40392157, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 100
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!1 &7475683957958847145
GameObject:
m_ObjectHideFlags: 0
@ -6049,22 +6240,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
@ -6100,6 +6275,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &1735899025626293379 stripped
@ -6225,22 +6416,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
@ -6276,6 +6451,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &1751704657233609385 stripped

View File

@ -3319,7 +3319,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: 28fe74f2d05b9b74da40d6edd3f34aed, type: 3}
m_Sprite: {fileID: 21300000, guid: f3efca0b27d32994690f0ed37669a3c6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -10649,7 +10649,7 @@ ParticleSystem:
--- !u!199 &2995780848406394084
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -3750,8 +3750,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 938.6, y: -533}
m_AnchoredPosition: {x: 0, y: 81.42493}
m_SizeDelta: {x: 938.6, y: -370.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5302233718222194868
CanvasRenderer:
@ -11744,7 +11744,7 @@ ParticleSystem:
--- !u!199 &803831904554332959
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -17327,7 +17327,7 @@ ParticleSystem:
--- !u!199 &175963871488439658
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -32,9 +32,9 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
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: -501, y: 868.5}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39, y: -91.5}
m_SizeDelta: {x: 78, y: 82}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1560662682491857776
@ -266,10 +266,10 @@ RectTransform:
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 7
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: -61.659973, y: 753.8249}
m_SizeDelta: {x: 88.53003, y: 161.83}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -61.659973, y: -206.17511}
m_SizeDelta: {x: 88.53003, y: 161.82996}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &7004274454127098571
CanvasRenderer:
@ -448,10 +448,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 9
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: -502.05005, y: 37.5}
m_SizeDelta: {x: 76, y: 1697}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 37.94995, y: 37.5}
m_SizeDelta: {x: 76, y: -223}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6384431041022973103
CanvasRenderer:
@ -523,7 +523,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.000012327255, y: 50}
m_AnchoredPosition: {x: 0.000010128162, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -804,10 +804,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 8
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: 525, y: 37.5}
m_SizeDelta: {x: 76, y: 1697}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -15, y: 37.5}
m_SizeDelta: {x: 76, y: -223}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1431279937808817028
CanvasRenderer:
@ -1005,9 +1005,9 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 416.2, y: -85.900024}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -123.79999, y: -85.900024}
m_SizeDelta: {x: 218, y: 482}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &7259500788664693753
@ -1153,10 +1153,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
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: -413, y: 51}
m_SizeDelta: {x: 93, y: 1724}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: 51}
m_SizeDelta: {x: 93, y: -196}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &806722021412139932
CanvasRenderer:
@ -1227,10 +1227,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.050049, y: 896}
m_SizeDelta: {x: 736, y: 34}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 1.7, y: -73}
m_SizeDelta: {x: -344, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6556399879575764869
CanvasRenderer:
@ -1345,9 +1345,9 @@ RectTransform:
m_Father: {fileID: 6861030463589856289}
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: 0, y: 902}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -58}
m_SizeDelta: {x: 427, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2329685276496241844
@ -1419,10 +1419,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 5
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.050049, y: -836}
m_SizeDelta: {x: 1080, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -0.050048828, y: 124}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1325026835820964607
CanvasRenderer:
@ -1493,9 +1493,9 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 497.9, y: 868.5}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -42.100006, y: -91.5}
m_SizeDelta: {x: 78, y: 82}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3068409697385170719
@ -1565,10 +1565,10 @@ RectTransform:
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 4
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: 1.4, y: 29.35}
m_SizeDelta: {x: 770.4, y: 1677.7}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 1.3999939, y: 29.350006}
m_SizeDelta: {x: -309.59998, y: -242.30005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5714166555136849712
GameObject:
@ -1602,10 +1602,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 6
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: 416.2, y: 51}
m_SizeDelta: {x: 93, y: 1724}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -123.79999, y: 51}
m_SizeDelta: {x: 93, y: -196}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3182302859663826389
CanvasRenderer:
@ -1743,8 +1743,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
bgList:
- {fileID: 0}
- {fileID: 0}
- {fileID: 2324518939165282330}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
@ -2078,10 +2077,10 @@ RectTransform:
m_Father: {fileID: 6861030463589856289}
m_RootOrder: 9
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: 1.2, y: -776.8}
m_SizeDelta: {x: 749.9, y: 83.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 1.2000122, y: 183.20001}
m_SizeDelta: {x: -330.09998, y: 83.400024}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &551462396334624459
CanvasRenderer:
@ -2338,10 +2337,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
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.050049, y: 929}
m_SizeDelta: {x: 1080, y: 50}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.050048828, y: -31}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2397888977620469004
CanvasRenderer:
@ -2505,10 +2504,10 @@ RectTransform:
m_Father: {fileID: 4337632453246120809}
m_RootOrder: 4
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: 909.5}
m_SizeDelta: {x: 580, y: 101}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50.5}
m_SizeDelta: {x: -500, y: 101}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6691693314055234086
CanvasRenderer:

View File

@ -152,10 +152,10 @@ end
--获取单个英雄装备数据
function this.GetSingleHeroSingleEquipData(_equipid, _heroDid)
_equipid = tonumber(_equipid)
if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then
return HarmonyManager.equipDatas[_equipid]--.upHeroDidList[_heroDid]
elseif this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then
if this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then
return this.equipDatas[_equipid]
elseif HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then
return HarmonyManager.equipDatas[_equipid]--.upHeroDidList[_heroDid]
else
return nil
end

View File

@ -15,7 +15,7 @@ local rewardList={}--挑战奖励预设容器
local liveNodes={}--立绘容器
local liveNames={}--立绘名容器
local guildName--公会名称
local guildServer--公会服
local TabBox = require("Modules/Common/TabBox")
local _TabImgData = {select = "r_tongyong_xiaanniu_01", default = "r_tongyong_xiaanniu_02",}
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
@ -36,6 +36,7 @@ function DeathPosInfoPanel:InitComponent()
this.title=Util.GetGameObject(this.panel,"Title"):GetComponent("Text")
--当前占据公会名称
this.curGuildName=Util.GetGameObject(this.panel,"CurGuild/Name"):GetComponent("Text")
this.curGuildserverName=Util.GetGameObject(this.panel,"CurGuild/serverName"):GetComponent("Text")
--剩余挑战次数
this.battleTime=Util.GetGameObject(this.panel,"BattleTime"):GetComponent("Text")
@ -111,6 +112,7 @@ function DeathPosInfoPanel:OnOpen(...)
local args={...}
curIndex=args[1]
guildName=args[2]
guildServer=args[3]
end
function DeathPosInfoPanel:OnShow()
@ -157,6 +159,12 @@ function this.RefreshPanel()
end
this.curGuildName.text=guildName~="" and guildName or Language[10086] --设置公会名称 没有占据显示无
this.curGuildserverName.text = guildServer or ""
if not guildServer or guildServer == "" then
this.curGuildserverName.gameObject:SetActive(false)
else
this.curGuildserverName.gameObject:SetActive(true)
end
this.title.text=GetLanguageStrById(guildWarConfig[curIndex].Name)..Language[11025]
--【线上问题】十绝阵挑战次数显示负数 < 0 and 0 or (DeathPosManager.maxBattleTime-msg.challengeCount)
DeathPosManager.battleTime = DeathPosManager.battleTime < 0 and 0 or DeathPosManager.battleTime
@ -295,10 +303,15 @@ function this.SetScrollPre(root,data,curRankType)
this.SetRankingNum(root,data.rankInfo.rank,false)
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
name.text=string.format(Language[11027],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11052],data.guildName,data.rankInfo.param2)
or string.format(Language[11052],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
name.text=string.format("%s",data.userName)
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format("%s",data.userName)
or string.format("%s",data.userName)
end
hurt.text= DeathPosManager.ChangeDamageForm(data.rankInfo.param1)
end
--设置我的名次
@ -306,10 +319,15 @@ function this.SetMyRank(data,curRankType)
local guildData = MyGuildManager.GetMyGuildInfo()
this.SetRankingNum(this.mRRank,data.rank,true)
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
this.mRName.text=string.format(Language[11027],guildData.name,data.param2) --param2 人数
this.mRName.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11052],guildData.name,data.param2)
or string.format(Language[11052],guildData.name,data.param2) --param2 人数
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
this.mRName.text=PlayerManager.nickName
this.mRName.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..PlayerManager.nickName
or PlayerManager.nickName
end
this.mRHurt.text= DeathPosManager.ChangeDamageForm(data.param1) --param1 伤害
end
--设置名次 isMy 是否是设置我的名次

View File

@ -156,8 +156,8 @@ function this.RefreshPanel()
for i = 1, #preList do
Util.AddOnceClick(preList[i],function()
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
--local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text)--,serverName.text)
local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
UIManager.OpenPanel(UIName.DeathPosInfoPanel,i,guildName.text,serverName.text)
end)
end
end
@ -194,12 +194,12 @@ function this.RefreshGuildInfo()
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
guild:SetActive(true)
-- if value.serverName and value.serverName ~= "" then
-- serverName.text = value.serverName
-- else
-- Util.GetGameObject(preList[i],"serverName"):SetActive(false)
-- serverName.text = ""
-- end
if value.serverName and value.serverName ~= "" then
serverName.text = value.serverName
else
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
serverName.text = ""
end
guildName.text=value.guildName
--如果是自己的公会
guildImage.sprite= value.gid==PlayerManager.familyId and this.spLoader:LoadSprite(_image[2]) or this.spLoader:LoadSprite(_image[1])

View File

@ -33,6 +33,7 @@ local _PanelType = {
local list={}
local orginLayer2=0
local orginLayer=0
local isPlayanim,isTop = true,true
--初始化组件(用于子类重写)
function HeroAndEquipResolvePanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -214,11 +215,14 @@ end
--界面打开时调用(用于子类重写)
function HeroAndEquipResolvePanel:OnOpen(_tabType)
tabType=_tabType
isPlayanim = true
isTop = true
end
function HeroAndEquipResolvePanel:OnShow()
tabSortType=0
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PanelType[tabType] })
this.GetTabTypeShoePanel(tabType)
end
--隐藏 grid
function this.GetTabTypeShoePanel(_tabType)
@ -267,6 +271,13 @@ function this.SortTypeClick(_sortType,_btn)
if tabType == 4 then
list={}
soulPrintData= BagManager.GetAllSoulPrintData(tabSortType)
table.sort(soulPrintData,function(a,b)
if a.quality == b.quality then
return a.id < b.id
else
return a.quality < b.quality
end
end)
this.soulPrintChooseType=tabSortType
if(not soulPrintData or #soulPrintData<1) then
this.noneImage:SetActive(true)
@ -277,8 +288,13 @@ function this.SortTypeClick(_sortType,_btn)
this.ScrollView3:SetData(soulPrintData, function (index, go)
this:SetSoulPrintData(go, soulPrintData[index],index)
table.insert(list,go)
end)
end,not isTop,not isPlayanim)
if isPlayanim then
isPlayanim = false
end
if isTop then
isTop = false
end
--特效层级重设
for i=1,#list do
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
@ -444,7 +460,7 @@ function this.QuickSelectListData()
end
this.ScrollView3:SetData(soulPrintData, function (index, go)
this:SetSoulPrintData(go, soulPrintData[index],index)
end)
end,not isTop,not isPlayanim)
end
this.UpdataPanelRewardAndSelectText()
end
@ -581,7 +597,8 @@ function this.GetItemIsBeyondMaxNum(type,curResolveAllItemList)
end
--界面关闭时调用(用于子类重写)
function HeroAndEquipResolvePanel:OnClose()
isPlayanim = true
isTop = true
tabSortType = 0
end

View File

@ -1092,7 +1092,10 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
--刷新界面
this.ShowHeroEquip()
--上阵刷新红点
this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen)
this.allEquipUpRedPoint:SetActive(isUpZhen and
((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or
(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)
))
this:OnClickTabBtn(indexBtnNum)
-- --刷新当前英雄可穿装备
-- if indexBtnNum == PosIdConst.All then
@ -1191,7 +1194,11 @@ end
function this:SortEquipDatas(_equipDatas)
if teamHero[curHeroData.dynamicId] then
isUpZhen = true
this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen)
--上阵刷新红点
this.allEquipUpRedPoint:SetActive(isUpZhen and
((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or
(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)
))
curHeroCanUpEquipTabs = HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId)
else
isUpZhen = false