Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
luyao
commit
9e2f4e1512
|
|
@ -6131,9 +6131,9 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1640, y: -909}
|
||||
m_AnchoredPosition: {x: 1640, y: -1029}
|
||||
m_SizeDelta: {x: 860, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3007151774743498339
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6157,8 +6157,8 @@ MonoBehaviour:
|
|||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 20
|
||||
m_Bottom: 20
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 3
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
|
|
|
|||
|
|
@ -1,85 +1,5 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &395052110336182665
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7837319558304286115}
|
||||
- component: {fileID: 2224304849929061418}
|
||||
- component: {fileID: 1587157240035981223}
|
||||
m_Layer: 0
|
||||
m_Name: TextPre
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7837319558304286115
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 395052110336182665}
|
||||
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: 5743257853158127750}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 225, y: -40}
|
||||
m_SizeDelta: {x: 250, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2224304849929061418
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 395052110336182665}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1587157240035981223
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 395052110336182665}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
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: "\xB7\u5168\u4F53\u795E\u5C06\u751F\u547D+3000"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &445942609768982801
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -285,7 +205,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8191012020774304628}
|
||||
- {fileID: 5743257853158127750}
|
||||
- {fileID: 4469253690087178079}
|
||||
m_Father: {fileID: 1828482313430278523}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -877,6 +797,176 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &3135642949671645335
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4469253690087178079}
|
||||
- component: {fileID: 6585703927883856743}
|
||||
- component: {fileID: 6965158040882608152}
|
||||
- component: {fileID: 4369420290039196202}
|
||||
m_Layer: 5
|
||||
m_Name: AddList
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4469253690087178079
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3135642949671645335}
|
||||
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: 6714661470204780157}
|
||||
m_Father: {fileID: 7442141385126438634}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -145}
|
||||
m_SizeDelta: {x: 550, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6585703927883856743
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3135642949671645335}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6965158040882608152
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3135642949671645335}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 100
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &4369420290039196202
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3135642949671645335}
|
||||
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: 0
|
||||
m_Spacing: 20
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!1 &3393813220120465767
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6714661470204780157}
|
||||
- component: {fileID: 6919817761686733272}
|
||||
- component: {fileID: 5505314840092843114}
|
||||
m_Layer: 0
|
||||
m_Name: TextPre
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6714661470204780157
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3393813220120465767}
|
||||
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: 4469253690087178079}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 225, y: -40}
|
||||
m_SizeDelta: {x: 550, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6919817761686733272
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3393813220120465767}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5505314840092843114
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3393813220120465767}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\xB7\u5168\u4F53\u795E\u5C06\u751F\u547D+3000"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &3490801065415971355
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2608,97 +2698,6 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!1 &7670559230552919807
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5743257853158127750}
|
||||
- component: {fileID: 7931651749744057525}
|
||||
- component: {fileID: 5762230958227516854}
|
||||
- component: {fileID: 1953130429167673892}
|
||||
m_Layer: 5
|
||||
m_Name: AddList
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5743257853158127750
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7670559230552919807}
|
||||
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: 7837319558304286115}
|
||||
m_Father: {fileID: 7442141385126438634}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -145}
|
||||
m_SizeDelta: {x: 550, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7931651749744057525
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7670559230552919807}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5762230958227516854
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7670559230552919807}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 100
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &1953130429167673892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7670559230552919807}
|
||||
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: 20
|
||||
m_ChildAlignment: 3
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 250, y: 30}
|
||||
m_Spacing: {x: 30, y: 20}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 1
|
||||
--- !u!1 &8039350172597770738
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -14109,12 +14109,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1830989272795780814}
|
||||
m_Father: {fileID: 1467844528978285286}
|
||||
m_RootOrder: 7
|
||||
m_Father: {fileID: 3434667051725398}
|
||||
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, y: -250}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -135}
|
||||
m_SizeDelta: {x: 250, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7306719755428207597
|
||||
|
|
@ -17933,8 +17933,7 @@ RectTransform:
|
|||
- {fileID: 1177825343982519204}
|
||||
- {fileID: 6475382134693875839}
|
||||
- {fileID: 2332250532228594229}
|
||||
- {fileID: 8375336840715324144}
|
||||
- {fileID: 203817331770009106}
|
||||
- {fileID: 3434667051725398}
|
||||
m_Father: {fileID: 2925180131101153177}
|
||||
m_RootOrder: 39
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -23511,12 +23510,12 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2406047672103772645}
|
||||
- {fileID: 5892851672121453996}
|
||||
m_Father: {fileID: 1467844528978285286}
|
||||
m_RootOrder: 6
|
||||
m_Father: {fileID: 3434667051725398}
|
||||
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: -160.2}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -35}
|
||||
m_SizeDelta: {x: 188, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1738108596221402211
|
||||
|
|
@ -27206,6 +27205,67 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u589E\u76CA\u6548\u679C"
|
||||
LanguageIndex: 11275
|
||||
--- !u!1 &5762612044416986375
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3434667051725398}
|
||||
- component: {fileID: 2812018699646066945}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3434667051725398
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5762612044416986375}
|
||||
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: 8375336840715324144}
|
||||
- {fileID: 203817331770009106}
|
||||
m_Father: {fileID: 1467844528978285286}
|
||||
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: 0, y: -203}
|
||||
m_SizeDelta: {x: 100, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2812018699646066945
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5762612044416986375}
|
||||
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: 4
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &5804231184545886116
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -85,6 +85,8 @@ GameObject:
|
|||
- component: {fileID: 787815193}
|
||||
- component: {fileID: 787815195}
|
||||
- component: {fileID: 345535409737851410}
|
||||
- component: {fileID: 3282016280353546655}
|
||||
- component: {fileID: 470471732384404232}
|
||||
m_Layer: 5
|
||||
m_Name: propertyGrid
|
||||
m_TagString: Untagged
|
||||
|
|
@ -147,6 +149,68 @@ MonoBehaviour:
|
|||
m_Spacing: {x: 0, y: -3.67}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!114 &3282016280353546655
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 787815192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 0
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &470471732384404232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 787815192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
|
||||
--- !u!1 &981572256
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1169,6 +1169,7 @@ QualityTextDef = {
|
|||
[3] = "#76ABECFF",--蓝色
|
||||
[4] = "#B677DAFF",--紫色
|
||||
[5] = "#F6934AFF",--橙色
|
||||
[6] = "#E25B58FF",--红色
|
||||
}
|
||||
-- 通用UI颜色色值
|
||||
UIColor = {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ function this.UpdateFormation(msg)
|
|||
oTeam.teamPokemonInfos = {}
|
||||
this.formationList[team.teamId] = oTeam
|
||||
if isRefresh then
|
||||
FormationManager.RefreshFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {})
|
||||
FormationManager.SaveFormation(team.teamId, this.formationList[team.teamId].teamHeroInfos, {})
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -247,9 +247,7 @@ function this.GetFormationByID(teamId)
|
|||
local _v=tonumber(v)
|
||||
if teamId==_v and #this.formationList[teamId].teamHeroInfos<=0 then
|
||||
for n = 1, #this.formationList[1].teamHeroInfos do
|
||||
if HeroManager.GetSingleHeroData(this.formationList[1].teamHeroInfos.heroId) then
|
||||
table.insert(this.formationList[teamId].teamHeroInfos, this.formationList[1].teamHeroInfos[n])
|
||||
end
|
||||
table.insert(this.formationList[teamId].teamHeroInfos, this.formationList[1].teamHeroInfos[n])
|
||||
end
|
||||
--
|
||||
FormationManager.SaveFormation(teamId, this.formationList[teamId].teamHeroInfos, {})
|
||||
|
|
|
|||
|
|
@ -12,35 +12,32 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
|||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
|
||||
local _TabData = {
|
||||
[1]= {txt = "全部",quality = 0},
|
||||
[2]= {txt = "蓝色",quality = 2},
|
||||
[3]= {txt = "紫色",quality = 3},
|
||||
[4]= {txt = "金色",quality = 4},
|
||||
[5]= {txt = "红色",quality = 5},
|
||||
[2]= {txt = "蓝色",quality = 3},
|
||||
[3]= {txt = "紫色",quality = 4},
|
||||
[4]= {txt = "金色",quality = 5},
|
||||
[5]= {txt = "红色",quality = 6},
|
||||
}
|
||||
|
||||
local QUALITY = {
|
||||
-- [1] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[2] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[3] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
|
||||
[4] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
|
||||
[5] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||
[3] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[4] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
|
||||
[5] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
|
||||
[6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||
-- [7] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
}
|
||||
|
||||
--初始化组件（用于子类重写）
|
||||
function QiJieTreasure:InitComponent(gameObject)
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.GameObject = Util.GetGameObject(gameObject,"Scroll")
|
||||
self.Scroll = Util.GetGameObject(gameObject,"Scroll")
|
||||
self.itemPre = Util.GetGameObject(gameObject, "Pre")
|
||||
self.tabbox = Util.GetGameObject(gameObject, "tabbox")
|
||||
self.goBtn = Util.GetGameObject(gameObject, "Button")
|
||||
self.treasureNum = Util.GetGameObject(gameObject, "Num"):GetComponent("Text")
|
||||
|
||||
local rootHight = self.GameObject.transform.rect.height
|
||||
local width = self.GameObject.transform.rect.width
|
||||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollFitterView, self.GameObject.transform,
|
||||
self.itemPre, Vector2.New(width, rootHight), 1, 0)
|
||||
local rootHight = self.Scroll.transform.rect.height
|
||||
local width = self.Scroll.transform.rect.width
|
||||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
|
||||
self.itemPre,nil, Vector2.New(width, rootHight), 1, 1,Vector2.New(0, 0))
|
||||
self.ScrollView.moveTween.MomentumAmount = 1
|
||||
self.ScrollView.moveTween.Strength = 2
|
||||
self.ScrollView.elastic = false
|
||||
|
|
@ -71,8 +68,8 @@ end
|
|||
function QiJieTreasure:OnShow(_parent,...)
|
||||
parent =_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
self.bool = false
|
||||
self:SetTabBox()
|
||||
self:Refresh()
|
||||
end
|
||||
|
||||
function QiJieTreasure:SetTabBox()
|
||||
|
|
@ -85,7 +82,8 @@ function QiJieTreasure:SetTabBox()
|
|||
end
|
||||
|
||||
local OnTabChange = function (index)
|
||||
self:Refresh(_TabData[index].quality)
|
||||
self.quality = _TabData[index].quality
|
||||
self:Refresh()
|
||||
end
|
||||
|
||||
self.TabCtrl = TabBox.New()
|
||||
|
|
@ -94,12 +92,13 @@ function QiJieTreasure:SetTabBox()
|
|||
self.TabCtrl:Init(self.tabbox, _TabData)
|
||||
end
|
||||
|
||||
function QiJieTreasure:Refresh(_tabNum)
|
||||
self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum)
|
||||
function QiJieTreasure:Refresh()
|
||||
self.dataList = QiJieShiLianManager.FormatTreasureData(self.quality)
|
||||
self.treasureNum.text = string.format( "解锁遗物：%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
|
||||
self.ScrollView:SetData(self.dataList, function(index, go)
|
||||
self:SetSingleData(index,go,self.dataList[index])
|
||||
end)
|
||||
end,self.bool,self.bool)
|
||||
self.bool = true
|
||||
end
|
||||
|
||||
function QiJieTreasure:SetSingleData(index,_go,_data)
|
||||
|
|
@ -107,7 +106,7 @@ function QiJieTreasure:SetSingleData(index,_go,_data)
|
|||
local obj = Util.GetGameObject(_go,"Pre ("..i..")")
|
||||
if _data[i] then
|
||||
obj:SetActive(true)
|
||||
Util.GetGameObject(obj,"Name"):GetComponent("Text").text = string.format( "<color=%s>%s</color>",QualityTextDef[_data[i].Quality+1],_data[i].Name)
|
||||
Util.GetGameObject(obj,"Name"):GetComponent("Text").text = string.format( "<color=%s>%s</color>",QualityTextDef[_data[i].Quality],_data[i].Name)
|
||||
local img = Util.GetGameObject(obj,"Image"):GetComponent("Image")
|
||||
local imgLight = Util.GetGameObject(obj,"light"):GetComponent("Image")
|
||||
local imgKuang = Util.GetGameObject(obj,"kuang"):GetComponent("Image")
|
||||
|
|
@ -128,6 +127,7 @@ end
|
|||
|
||||
--界面关闭时调用（用于子类重写）
|
||||
function QiJieTreasure:OnClose()
|
||||
self.quality = 0
|
||||
end
|
||||
|
||||
--界面销毁时调用（用于子类重写）
|
||||
|
|
|
|||
|
|
@ -46,6 +46,10 @@ end
|
|||
|
||||
-- 请求创建公会
|
||||
function GuildManager.RequestCreateGuild(name, announce, func)
|
||||
if not NameManager.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
return
|
||||
end
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD) then
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
return
|
||||
|
|
|
|||
|
|
@ -368,6 +368,10 @@ end
|
|||
|
||||
-- 请求修改公会名称
|
||||
function MyGuildManager.RequestChangeGuildName(name, func)
|
||||
if not NameManager.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
return
|
||||
end
|
||||
local pos = this.GetMyPositionInGuild()
|
||||
if pos == GUILD_GRANT.MEMBER then
|
||||
PopupTipPanel.ShowTip(Language[10962])
|
||||
|
|
|
|||
|
|
@ -513,6 +513,14 @@ function this.DeleteHeroDatas(heroDIds)
|
|||
-- end
|
||||
--end
|
||||
|
||||
-- 清除佩戴的魂印
|
||||
local soulPrintList = heroDatas[heroDIds[i]].soulPrintList
|
||||
for i = 1, #soulPrintList do
|
||||
if soulPrintList[i] then
|
||||
SoulPrintManager.DelSoulPrintUpHeroDynamicId(soulPrintList[i].equipId, heroDIds[i])
|
||||
end
|
||||
end
|
||||
|
||||
--清楚编队上的英雄
|
||||
FormationManager.AllFormationDeleCurHeroId(heroDIds[i])
|
||||
--清除英雄魂印上挂载的英雄did
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ local type = {
|
|||
id = JumpServer_Type.QiJieShiLian,
|
||||
funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN,
|
||||
sort = 2,
|
||||
bg = "q_qjsl_rikou_di",
|
||||
bg = "m_syjm_0026_png",
|
||||
name = "q_qjsl_rikou_ysz",
|
||||
live = "m_chsm_0035_png",
|
||||
livePos = Vector2(274.5, -408.1),
|
||||
liveSize = Vector2(1612, 1802),
|
||||
live = "",
|
||||
livePos = Vector2(0,0),
|
||||
liveSize = Vector2(0,0),
|
||||
tipBg = "r_Dungeon_juqingdian",
|
||||
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[127].Value),
|
||||
tip = "",
|
||||
|
|
@ -163,10 +163,12 @@ function JumpServerPanel:BtnClick(id)
|
|||
|
||||
if id == JumpServer_Type.HightLadder then
|
||||
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
|
||||
self:ClosePanel()
|
||||
end
|
||||
|
||||
if id == JumpServer_Type.YuXuLunDao then
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel)
|
||||
self:ClosePanel()
|
||||
end
|
||||
if id == JumpServer_Type.QiJieShiLian then
|
||||
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
|
||||
|
|
@ -174,6 +176,7 @@ function JumpServerPanel:BtnClick(id)
|
|||
QiJieShiLianManager.IsLock = false
|
||||
if qiejieConfig[msg.id] then
|
||||
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
|
||||
self:ClosePanel()
|
||||
else
|
||||
LogError("七界试炼不存在该ID："..tostring(msg.id))
|
||||
PopupTipPanel.ShowTip("无法进入，请联系客服！")
|
||||
|
|
|
|||
|
|
@ -57,8 +57,19 @@ function this.GetRandomNameData()
|
|||
end)
|
||||
end
|
||||
|
||||
-- 字符正确性检测
|
||||
function this.CheckStringRight(str)
|
||||
if string.find(str, "|") then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
--更改玩家姓名
|
||||
function this.ChangeUserName(type, name, teamPosId, sex, callBack)
|
||||
if not this.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
return
|
||||
end
|
||||
NetManager.ChangeUserNameRequest(type, name, teamPosId, sex, function()
|
||||
this.roleSex = sex
|
||||
this.roleName = name
|
||||
|
|
|
|||
|
|
@ -6,13 +6,10 @@ local QijieHolyConfig=ConfigManager.GetConfig(ConfigName.QijieHolyConfig)
|
|||
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
|
||||
local QUALITY = {
|
||||
-- [1] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[2] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[3] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
|
||||
[4] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
|
||||
[5] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||
[3] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
[4] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"},
|
||||
[5] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"},
|
||||
[6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"},
|
||||
-- [7] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"},
|
||||
}
|
||||
|
||||
function QiJieSingleTreasure:InitComponent(gameObject)
|
||||
|
|
@ -22,10 +19,10 @@ function QiJieSingleTreasure:InitComponent(gameObject)
|
|||
self.Img = Util.GetGameObject(gameObject,"Image"):GetComponent("Image")
|
||||
self.light = Util.GetGameObject(gameObject,"light"):GetComponent("Image")
|
||||
self.kuang = Util.GetGameObject(gameObject,"kuang"):GetComponent("Image")
|
||||
self.cost = Util.GetGameObject(gameObject,"cost")
|
||||
self.costIcon = Util.GetGameObject(gameObject,"cost/Icon"):GetComponent("Image")
|
||||
self.costNum = Util.GetGameObject(gameObject,"cost/Num"):GetComponent("Text")
|
||||
self.activeBtn = Util.GetGameObject(gameObject,"activeBtn")
|
||||
self.cost = Util.GetGameObject(gameObject,"GameObject/cost")
|
||||
self.costIcon = Util.GetGameObject(gameObject,"GameObject/cost/Icon"):GetComponent("Image")
|
||||
self.costNum = Util.GetGameObject(gameObject,"GameObject/cost/Num"):GetComponent("Text")
|
||||
self.activeBtn = Util.GetGameObject(gameObject,"GameObject/activeBtn")
|
||||
self.activeText = Util.GetGameObject(self.activeBtn,"Text"):GetComponent("Text")
|
||||
end
|
||||
|
||||
|
|
@ -54,7 +51,7 @@ function QiJieSingleTreasure:OnShow(_parent,...)
|
|||
end
|
||||
|
||||
function QiJieSingleTreasure:Refresh()
|
||||
self.title.text = self.data.Name
|
||||
self.title.text = string.format( "<color=%s>%s</color>",QualityTextDef[self.data.Quality],self.data.Name)
|
||||
self.Img.sprite = self.spLoader:LoadSprite(artResourcesConfig[self.data.Icon].Name)
|
||||
self.light.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].light)
|
||||
self.kuang.sprite = self.spLoader:LoadSprite(QUALITY[self.data.Quality].kuang)
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ function this.GetTreasureEffect(treasureList)
|
|||
local attriList2 = {}
|
||||
-- LogYellow(tostring(#treasureList))
|
||||
for i = 1, #treasureList do
|
||||
LogYellow(tostring(treasureList[i]))
|
||||
-- LogYellow(tostring(treasureList[i]))
|
||||
local tData = QijieHolyConfig[treasureList[i]]
|
||||
--界灵数量加成
|
||||
moneyNum = moneyNum + tData.Addition
|
||||
|
|
|
|||
|
|
@ -126,18 +126,18 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o,monsterId, _pos)
|
|||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId)
|
||||
|
||||
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
||||
bg.sprite = self.spLoader:LoadSprite(GetHeroCardStarBg[heroConfig.Star])
|
||||
bg.sprite = self.spLoader:LoadSprite(GetHeroCardStarBg[monsterconfig.Star])
|
||||
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
|
||||
fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[heroConfig.Star])
|
||||
fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monsterconfig.Star])
|
||||
|
||||
-- local live=Util.GetGameObject(o,"Mask/Live")
|
||||
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
||||
lv.text=monsterconfig.Level
|
||||
|
||||
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
|
||||
pro.sprite=self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
pro.sprite=self.spLoader:LoadSprite(GetProStrImageByProNum(monsterconfig.PropertyName))
|
||||
local starGrid=Util.GetGameObject(o,"StarGrid")
|
||||
SetCardStars(starGrid,heroConfig.Star)
|
||||
SetCardStars(starGrid,monsterconfig.Star)
|
||||
local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text")
|
||||
name.text=heroConfig.ReadingName
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o,monsterId, _pos)
|
|||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
local zs = Util.GetGameObject(o, "zs")
|
||||
local zsName = GetHeroCardStarZs[heroConfig.Star]
|
||||
local zsName = GetHeroCardStarZs[monsterconfig.Star]
|
||||
if zsName == "" then
|
||||
zs:SetActive(false)
|
||||
else
|
||||
|
|
@ -159,11 +159,9 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o,monsterId, _pos)
|
|||
zs:GetComponent("Image").sprite = self.spLoader:LoadSprite(zsName)
|
||||
end
|
||||
|
||||
if heroConfig.Star > 9 then
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
|
||||
else
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
|
||||
end
|
||||
local effect = Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai")
|
||||
effect.gameObject:SetActive(monsterconfig.Star > 9)
|
||||
Util.SetParticleSortLayer(effect.gameObject, sortingOrder + 1)
|
||||
end
|
||||
|
||||
function QiJieShiLianMonsterInfo:OnClose()
|
||||
|
|
|
|||
|
|
@ -69,9 +69,11 @@ function HeroAndEquipResolvePanel:InitComponent()
|
|||
soulPrintEndBtns[i]=Util.GetGameObject(self.transform, "endTabs/btnSoulPrintGrid/btnSoulPrintGrid/Btn"..i)
|
||||
Util.AddClick( soulPrintEndBtns[i], function()
|
||||
if tabSortType == i+3 then
|
||||
isTop = true
|
||||
this.SortTypeClick(0,equipEndBtns[i])--全部
|
||||
else
|
||||
tabSortType = i+3
|
||||
isTop = true
|
||||
this.SortTypeClick(tabSortType,soulPrintEndBtns[i])
|
||||
end
|
||||
end)
|
||||
|
|
@ -296,11 +298,11 @@ function this.SortTypeClick(_sortType,_btn)
|
|||
isTop = false
|
||||
end
|
||||
--特效层级重设
|
||||
for i=1,#list do
|
||||
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
|
||||
end
|
||||
orginLayer2 = this.sortingOrder
|
||||
orginLayer = this.sortingOrder
|
||||
for i=1,#list do
|
||||
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
|
||||
end
|
||||
orginLayer2 = this.sortingOrder
|
||||
orginLayer = this.sortingOrder
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -490,10 +492,6 @@ function this.SendBackResolveReCallBack(drop)
|
|||
local soulPrint= SoulPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType)
|
||||
soulPrintData=SoulPrintManager.GetSoulPrintAndSort(soulPrint)
|
||||
this.selectText.text = Language[11728].."0/"..#soulPrintData
|
||||
--this.SortSoulPrintData(soulPrintData)
|
||||
--this.ScrollView3:SetData(soulPrintData, function (index, go)
|
||||
-- this:SetSoulPrintData(go, soulPrintData[index],index)
|
||||
--end)
|
||||
end
|
||||
this.CleanSelectList()
|
||||
--刷新界面
|
||||
|
|
@ -518,8 +516,8 @@ function this.ResolveBtnClickEvent()
|
|||
temp[chooseIdList[i]] = 1
|
||||
end
|
||||
if not isSoulPrintShowSure then
|
||||
for i=1,#soulPrintData do
|
||||
if soulPrintData[i].id == chooseIdList[i] and soulPrintData[i].quality >= 4 then
|
||||
for x=1,#soulPrintData do
|
||||
if soulPrintData[x].id == chooseIdList[i] and soulPrintData[x].quality > 4 then
|
||||
isSoulPrintShowSure=true
|
||||
break
|
||||
end
|
||||
|
|
|
|||
|
|
@ -75,14 +75,14 @@ function this.ReceiveShopData(msg)
|
|||
-- 更新事件
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Shop.OnShopInfoChange)
|
||||
|
||||
for _, shopData in ipairs(this.allShopData) do
|
||||
local name = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"Id",shopData.id).Name
|
||||
Log("商店名称:"..tostring(name).."商店id:"..shopData.id.." 结束时间："..tostring(TimeStampToDateStr(shopData.endTime/1000))..
|
||||
" 上次刷新时间："..tostring(TimeStampToDateStr(shopData.lastRefreshTime/1000)))
|
||||
-- for _, v in ipairs(shopData.storeItem) do
|
||||
-- Log("商品Id:"..v.id .." 购买次数:" .. v.buyNum)
|
||||
-- end
|
||||
end
|
||||
-- for _, shopData in ipairs(this.allShopData) do
|
||||
-- local name = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"Id",shopData.id).Name
|
||||
-- Log("商店名称:"..tostring(name).."商店id:"..shopData.id.." 结束时间："..tostring(TimeStampToDateStr(shopData.endTime/1000))..
|
||||
-- " 上次刷新时间："..tostring(TimeStampToDateStr(shopData.lastRefreshTime/1000)))
|
||||
-- -- for _, v in ipairs(shopData.storeItem) do
|
||||
-- -- Log("商品Id:"..v.id .." 购买次数:" .. v.buyNum)
|
||||
-- -- end
|
||||
-- end
|
||||
end
|
||||
|
||||
-- 更新商店数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue