Merge branch 'china/dev' into china/飞升
commit
a7ad2ee1f6
|
@ -2249,7 +2249,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: -408, y: 632}
|
||||
m_AnchoredPosition: {x: -408, y: 626}
|
||||
m_SizeDelta: {x: 156, y: 422}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6359757417219209894
|
||||
|
|
|
@ -86,6 +86,86 @@ MonoBehaviour:
|
|||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!1 &339245490448663517
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 306234894335262045}
|
||||
- component: {fileID: 2547070929771342425}
|
||||
- component: {fileID: 8773789300031343826}
|
||||
m_Layer: 5
|
||||
m_Name: curProVale
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &306234894335262045
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 339245490448663517}
|
||||
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: 8210693043289154658}
|
||||
m_Father: {fileID: 1417629301715810043}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2547070929771342425
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 339245490448663517}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8773789300031343826
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 339245490448663517}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: +66
|
||||
--- !u!1 &364503659454277403
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -260,8 +340,7 @@ 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:
|
||||
- {fileID: 8851894391336208869}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8569408221378906818}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -312,6 +391,86 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: +66
|
||||
--- !u!1 &901090634268091325
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5360054861317454577}
|
||||
- component: {fileID: 7449147185561767551}
|
||||
- component: {fileID: 4347203054013633132}
|
||||
m_Layer: 0
|
||||
m_Name: PropertyName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5360054861317454577
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901090634268091325}
|
||||
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: 2111386558047614758}
|
||||
m_RootOrder: 1
|
||||
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: 100, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7449147185561767551
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901090634268091325}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4347203054013633132
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901090634268091325}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 1
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6458\u661F\u9601\u52A0\u6301\uFF1A"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1085209714314989767
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -576,6 +735,87 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1276990293255353059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1417629301715810043}
|
||||
- component: {fileID: 1199318821368246912}
|
||||
- component: {fileID: 5815895390516875656}
|
||||
m_Layer: 5
|
||||
m_Name: curProName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1417629301715810043
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1276990293255353059}
|
||||
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: 306234894335262045}
|
||||
m_Father: {fileID: 2538206906522360066}
|
||||
m_RootOrder: 0
|
||||
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 &1199318821368246912
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1276990293255353059}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5815895390516875656
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1276990293255353059}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u62A4\u7532"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1300421713178413199
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -860,7 +1100,7 @@ RectTransform:
|
|||
- {fileID: 2729895378572737907}
|
||||
- {fileID: 2326936323343625867}
|
||||
m_Father: {fileID: 2948461849611934824}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
@ -936,7 +1176,7 @@ RectTransform:
|
|||
- {fileID: 3535724585431877029}
|
||||
- {fileID: 8420829159650770875}
|
||||
m_Father: {fileID: 2948461849611934824}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
@ -1627,6 +1867,101 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 912, y: 130}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3043429802927297716
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3198923251045082768}
|
||||
- component: {fileID: 4884337174366809649}
|
||||
- component: {fileID: 3129421774889529437}
|
||||
- component: {fileID: 1896485925797257595}
|
||||
m_Layer: 5
|
||||
m_Name: line
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3198923251045082768
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3043429802927297716}
|
||||
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: 2111386558047614758}
|
||||
m_RootOrder: 0
|
||||
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: 0, y: -4}
|
||||
m_SizeDelta: {x: 900, y: 8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4884337174366809649
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3043429802927297716}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3129421774889529437
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3043429802927297716}
|
||||
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: 19d5542f3ad36154883cfc2022d17e0a, 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 &1896485925797257595
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3043429802927297716}
|
||||
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 &3148035006110076297
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2751,85 +3086,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u83B7\u53D6\u9014\u5F84"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &5257108890205232593
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8851894391336208869}
|
||||
- component: {fileID: 5822766328601761149}
|
||||
- component: {fileID: 1833719740022070665}
|
||||
m_Layer: 5
|
||||
m_Name: homeValue
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8851894391336208869
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5257108890205232593}
|
||||
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: 3843790720774461504}
|
||||
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: 400, y: 0}
|
||||
m_SizeDelta: {x: 250, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5822766328601761149
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5257108890205232593}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1833719740022070665
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5257108890205232593}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &5339795739591329494
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2909,6 +3165,91 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &5369503593336553800
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2538206906522360066}
|
||||
- component: {fileID: 3252014967305954959}
|
||||
- component: {fileID: 7889514046270932701}
|
||||
- component: {fileID: 2610837192841897614}
|
||||
m_Layer: 5
|
||||
m_Name: grid
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2538206906522360066
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5369503593336553800}
|
||||
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: 1417629301715810043}
|
||||
m_Father: {fileID: 2111386558047614758}
|
||||
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: 467.5, y: 0}
|
||||
m_SizeDelta: {x: 875, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3252014967305954959
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5369503593336553800}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7889514046270932701
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5369503593336553800}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 100
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 250, y: 50}
|
||||
m_Spacing: {x: 150, y: 0}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 1
|
||||
--- !u!114 &2610837192841897614
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5369503593336553800}
|
||||
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 &5539070635017549200
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3335,6 +3676,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7691181773687293707}
|
||||
- {fileID: 2111386558047614758}
|
||||
- {fileID: 4139601617807381921}
|
||||
- {fileID: 6594472603124481167}
|
||||
m_Father: {fileID: 5981932543035177726}
|
||||
|
@ -3774,6 +4116,83 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &6799905526993297981
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2111386558047614758}
|
||||
- component: {fileID: 7059021513111261155}
|
||||
- component: {fileID: 168891464966413774}
|
||||
m_Layer: 5
|
||||
m_Name: homePro
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2111386558047614758
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6799905526993297981}
|
||||
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: 3198923251045082768}
|
||||
- {fileID: 5360054861317454577}
|
||||
- {fileID: 2538206906522360066}
|
||||
m_Father: {fileID: 2948461849611934824}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 452.5, y: 0}
|
||||
m_SizeDelta: {x: 905, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7059021513111261155
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6799905526993297981}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 30
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!114 &168891464966413774
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6799905526993297981}
|
||||
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 &6889380681019265094
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4054,6 +4473,85 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u4F7F \u7528"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7625625760669645115
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8210693043289154658}
|
||||
- component: {fileID: 7634621174935024230}
|
||||
- component: {fileID: 6255998838981631232}
|
||||
m_Layer: 5
|
||||
m_Name: homeValue
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8210693043289154658
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625625760669645115}
|
||||
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: 306234894335262045}
|
||||
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: 400, y: 0}
|
||||
m_SizeDelta: {x: 250, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7634621174935024230
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625625760669645115}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6255998838981631232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7625625760669645115}
|
||||
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &7656865276646392508
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -3515,7 +3515,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: 315, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 30}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &2869837981932690049
|
||||
|
@ -4824,7 +4824,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: 450, y: 135.20001}
|
||||
m_AnchoredPosition: {x: 449, y: 135.20001}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4075901220966401463
|
||||
|
@ -7267,8 +7267,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 80}
|
||||
m_AnchoredPosition: {x: 35, y: 0}
|
||||
m_SizeDelta: {x: 70, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9114218537319145345
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -6989,7 +6989,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: 58, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 101}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &6149476631504047147
|
||||
|
@ -9323,7 +9323,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 54.505127, y: -25.000061}
|
||||
m_AnchoredPosition: {x: 40, y: -25.000061}
|
||||
m_SizeDelta: {x: 56.39, y: 56.39}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &8123468436595037891
|
||||
|
|
|
@ -322,7 +322,7 @@ function FirstRechargePanel:OnRechargeBtnClicked()
|
|||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then
|
||||
JumpManager.GoJump(36012)
|
||||
else
|
||||
JumpManager.GoJump(36001)
|
||||
JumpManager.GoJump(36008)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1773,6 +1773,7 @@ function this.RequestUserForceChange(teamId, func)
|
|||
data.teamId = teamId
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_FORCE_CHANGE_REQUEST, MessageTypeProto_pb.USER_FORCE_CHANGE_RESPONSE, msg, function()
|
||||
CheckRedPointStatus(RedPointType.Practice_Cultivation)
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
|
|
|
@ -53,7 +53,7 @@ function MonthCardPage:BindEvent()
|
|||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then
|
||||
JumpManager.GoJump(36012)
|
||||
else
|
||||
JumpManager.GoJump(36001)
|
||||
JumpManager.GoJump(36008)
|
||||
end
|
||||
else
|
||||
if self.curAllMonthCardData[cardData[i].cardType].state == 0 then
|
||||
|
|
|
@ -304,6 +304,9 @@ function PlayerInfoPopup:OnShow()
|
|||
end)
|
||||
else
|
||||
--目前只给灵脉,如果还有其他请写明备注
|
||||
this.InfoBtns:SetActive(false)
|
||||
this.InfoContentGrid:SetActive(false)
|
||||
this.pokemonObj:SetActive(false)
|
||||
this.extraInfo.Init(this,this.data,_ViewConfig[this._ViewType])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,6 +7,7 @@ local EquipStrengthen = ConfigManager.GetConfig(ConfigName.EquipStrengthen)
|
|||
local EquipRankUp = ConfigManager.GetConfig(ConfigName.EquipRankUp)
|
||||
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
|
||||
local _BaseProList = {}--基础属性对象
|
||||
local _homeProList = {}--摘星阁属性对象
|
||||
local _suitProList = {}--套装属性对象
|
||||
local _superProList = {}--白金属性对象
|
||||
local typeToUpdate = {
|
||||
|
@ -41,6 +42,12 @@ function RewardEquipSingleShowPopup2:InitComponent()
|
|||
self.baseProGrid = Util.GetGameObject(self.basePro, "grid")
|
||||
self.baseProPre = Util.GetGameObject(self.basePro, "grid/curProName")
|
||||
self.baseProPre:SetActive(false)
|
||||
--homePro
|
||||
self.homePro = Util.GetGameObject(self.midBar, "homePro")
|
||||
self.homeProName = Util.GetGameObject(self.homePro, "PropertyName"):GetComponent("Text")
|
||||
self.homeProGrid = Util.GetGameObject(self.homePro, "grid")
|
||||
self.homeProPre = Util.GetGameObject(self.homePro, "grid/curProName")
|
||||
self.homeProPre:SetActive(false)
|
||||
--suitPro
|
||||
self.suitPro = Util.GetGameObject(self.midBar, "suitPro")
|
||||
self.suitProName = Util.GetGameObject(self.suitPro, "PropertyName"):GetComponent("Text")
|
||||
|
@ -271,19 +278,11 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
_BaseProList[index]:SetActive(true)
|
||||
_BaseProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
||||
local vText = Util.GetGameObject(_BaseProList[index], "curProVale"):GetComponent("Text")
|
||||
--摘星阁加持
|
||||
local power = prop[2]
|
||||
local hText = Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text")
|
||||
hText.text = ""
|
||||
if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then
|
||||
local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)
|
||||
hText.text = string.format("(摘星阁加持:%s",num).."%)"
|
||||
power = math.ceil(power*(1 + num/100))
|
||||
end
|
||||
if power > 0 then
|
||||
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
|
||||
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
|
||||
if prop[2] > 0 then
|
||||
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
|
||||
else
|
||||
vText.text = GetPropertyFormatStr(proConfigData.Style, power)
|
||||
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -291,6 +290,33 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
self.basePro:SetActive(false)
|
||||
end
|
||||
|
||||
--homePro基础属性
|
||||
if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and self.curHeroData then
|
||||
self.homePro:SetActive(true)
|
||||
for _, pro in ipairs(_homeProList) do
|
||||
pro:SetActive(false)
|
||||
end
|
||||
if equipConfigData.Property then
|
||||
for index, prop in ipairs(equipConfigData.Property) do
|
||||
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
|
||||
if proConfigData and proConfigData.Style == 1 then
|
||||
local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)
|
||||
local power = math.ceil(prop[2]*(num/100))
|
||||
if not _homeProList[index] then
|
||||
_homeProList[index] = newObjToParent(self.homeProPre, self.homeProGrid)
|
||||
end
|
||||
_homeProList[index]:SetActive(true)
|
||||
_homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
||||
local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text")
|
||||
sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
|
||||
Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(%s",num).."%)"--摘星阁加持文字显示位置
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
self.homePro:SetActive(false)
|
||||
end
|
||||
|
||||
--suitPro套装属性
|
||||
--获取装备套装属性
|
||||
local equipSuite = {}
|
||||
|
@ -404,6 +430,7 @@ end
|
|||
function RewardEquipSingleShowPopup2:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
_BaseProList = {}
|
||||
_homeProList = {}
|
||||
_suitProList = {}
|
||||
_superProList = {}
|
||||
self.jumpViewList = {}
|
||||
|
|
|
@ -577,6 +577,7 @@ function RewardItemPopup:RedCheckFuns()
|
|||
CheckRedPointStatus(RedPointType.XunBaoMiZong)
|
||||
CheckRedPointStatus(RedPointType.Gem)
|
||||
CheckRedPointStatus(RedPointType.HomeLand)
|
||||
CheckRedPointStatus(RedPointType.Practice)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
@ -385,7 +385,7 @@ function this.SetMissionData()
|
|||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then
|
||||
JumpManager.GoJump(36012)
|
||||
else
|
||||
JumpManager.GoJump(36001)
|
||||
JumpManager.GoJump(36008)
|
||||
end
|
||||
else
|
||||
JumpManager.GoJump(dataConfig.Jump[1])
|
||||
|
|
|
@ -133,11 +133,7 @@ function this.SingleHeroDataShow(go,_heroData,_index)
|
|||
proIcon.gameObject:SetActive(false)
|
||||
starGrid:SetActive(false)
|
||||
end
|
||||
if curPage ~= 5 then
|
||||
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
|
||||
else
|
||||
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
|
||||
end
|
||||
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
|
||||
this.choosedList[go] = choosed
|
||||
this.choosedList[go]:SetActive( heroData.Id==currHeroId)
|
||||
|
||||
|
|
|
@ -217,7 +217,7 @@ function RoleInfoLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_he
|
|||
this:UpdateHeroUpLvAndBreakData()--升级
|
||||
--角色定位按钮
|
||||
this.posBtn.gameObject:SetActive(curHeroData.heroConfig.ShowHeroLocation==1)
|
||||
this.posInfo.text = curHeroData.heroConfig.HeroLocationDesc1
|
||||
this.posInfo.text = curHeroData.star < 11 and curHeroData.heroConfig.HeroLocationDesc1 or curHeroData.heroConfig.HeroLocationDesc4
|
||||
ForceRebuildLayout(this.posBtn.transform)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue