【界面优化】提交

dev_chengFeng
ZhangBiao 2021-10-29 11:13:29 +08:00
parent 1b13146915
commit c1f3658da4
11 changed files with 581 additions and 83 deletions

View File

@ -1727,7 +1727,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2, y: -0.000038455983}
m_AnchoredPosition: {x: -2, y: -0.000015048081}
m_SizeDelta: {x: 580.9, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6706607635529974733
@ -1784,7 +1784,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_LineSpacing: 1.2
m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709"
LanguageIndex: 10911
--- !u!1 &7770118332320716803

View File

@ -61529,7 +61529,7 @@ RectTransform:
m_LocalScale: {x: 0.999, y: 0.999, z: 1}
m_Children: []
m_Father: {fileID: 4322601328791050960}
m_RootOrder: 3
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}
@ -68516,8 +68516,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9009012, y: 0.9009012, z: 1}
m_Children:
- {fileID: 5379270429695241109}
- {fileID: 4323338970384050594}
- {fileID: 5200272102507085379}
- {fileID: 4323153670085066086}
- {fileID: 9168641677226492156}
m_Father: {fileID: 4322685788293027326}
@ -68596,7 +68595,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4322601328791050960}
m_RootOrder: 2
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}
@ -68778,16 +68777,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099714901469785816}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -26666.67}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4322601328791050960}
m_RootOrder: 1
m_Father: {fileID: 5200272102507085379}
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: -49.8, y: 2.6}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 42.855003, y: -31.13}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4320470717081024548
@ -89353,6 +89352,7 @@ GameObject:
- component: {fileID: 5379270429695241109}
- component: {fileID: 5381406082230122647}
- component: {fileID: 5201418988313521909}
- component: {fileID: 1476575246368815207}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -89367,17 +89367,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5314169557032298163}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -26666.67}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4322601328791050960}
m_RootOrder: 0
m_Father: {fileID: 5200272102507085379}
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: 28.499994, y: -1.7}
m_SizeDelta: {x: 112, y: 44}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 108.855, y: -31.13}
m_SizeDelta: {x: 92, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5381406082230122647
CanvasRenderer:
@ -89421,6 +89421,20 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 9999
--- !u!114 &1476575246368815207
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5314169557032298163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &5317355525285417315
GameObject:
m_ObjectHideFlags: 0
@ -142528,6 +142542,67 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7061262326827042859
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5200272102507085379}
- component: {fileID: 6413680582511918361}
m_Layer: 5
m_Name: Obj
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5200272102507085379
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7061262326827042859}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100.000015}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4323338970384050594}
- {fileID: 5379270429695241109}
m_Father: {fileID: 4322601328791050960}
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!114 &6413680582511918361
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7061262326827042859}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: -10
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: -10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &7062408465570657214
GameObject:
m_ObjectHideFlags: 0

View File

@ -700,7 +700,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2, y: -0.00005083497}
m_AnchoredPosition: {x: -2, y: -0.000004572168}
m_SizeDelta: {x: 666.65, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1304049099460694528
@ -757,7 +757,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_LineSpacing: 1.2
m_Text:
LanguageIndex: 10911
--- !u!114 &6865890053998197746

View File

@ -143,6 +143,7 @@ GameObject:
- component: {fileID: 3016392653976935956}
- component: {fileID: 4071136045482036103}
- component: {fileID: 1558663537049650340}
- component: {fileID: 8325218387507243886}
m_Layer: 5
m_Name: frame
m_TagString: Untagged
@ -165,9 +166,9 @@ RectTransform:
m_Father: {fileID: 3024438939271255525}
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -104, y: -115}
m_SizeDelta: {x: 129, y: 129}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4071136045482036103
@ -207,6 +208,26 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8325218387507243886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 590664654881297999}
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 &938571904773978294
GameObject:
m_ObjectHideFlags: 0
@ -24345,9 +24366,9 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 790.1, y: 84.1}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1726476276234419736
CanvasRenderer:
@ -24384,12 +24405,12 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 87
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_LineSpacing: 1.2
m_Text:
LanguageIndex: 0
--- !u!1 &6530305934527102091
@ -24503,7 +24524,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000024319, y: -19.2}
m_AnchoredPosition: {x: 0.000024319, y: -50}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8768997045821281013
@ -143632,7 +143653,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3024438939271255525}
- component: {fileID: 489433429541810365}
m_Layer: 5
m_Name: info
m_TagString: Untagged
@ -143658,29 +143678,6 @@ 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: 23.5, y: 41}
m_SizeDelta: {x: 1082.1, y: 141.2}
m_AnchoredPosition: {x: 71.5, y: -0.80000305}
m_SizeDelta: {x: 733.1, y: 232.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &489433429541810365
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9221993761843842177}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 47
m_Right: 0
m_Top: 3
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: -91.4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0

View File

@ -1,5 +1,104 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &992509301909931290
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 813468935050872712}
- component: {fileID: 49918149998143827}
- component: {fileID: 2686375523414558441}
- component: {fileID: 557116721571922468}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &813468935050872712
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992509301909931290}
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: 2442248684593713799}
m_Father: {fileID: 477558123132888962}
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 &49918149998143827
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992509301909931290}
m_CullTransparentMesh: 0
--- !u!114 &2686375523414558441
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992509301909931290}
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: 58c503111f310224a9a04ab39a004308, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &557116721571922468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992509301909931290}
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: 30
m_Top: 30
m_Bottom: 30
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!1 &1439811417794375501
GameObject:
m_ObjectHideFlags: 0
@ -382,8 +481,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 863404614654206844}
- {fileID: 149923463581893964}
- {fileID: 804089866084691144}
- {fileID: 477558123132888962}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -438,6 +539,206 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &5111547362530556905
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2442248684593713799}
- component: {fileID: 748089980995954121}
- component: {fileID: 5497362052186895629}
- component: {fileID: 420855515701961730}
- component: {fileID: 257291267816845289}
m_Layer: 5
m_Name: MContent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2442248684593713799
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5111547362530556905}
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: 813468935050872712}
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: 400, y: 0}
m_SizeDelta: {x: 740, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &748089980995954121
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5111547362530556905}
m_CullTransparentMesh: 0
--- !u!114 &5497362052186895629
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5111547362530556905}
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!114 &420855515701961730
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5111547362530556905}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 740
m_MinHeight: 350
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &257291267816845289
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5111547362530556905}
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: 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.4
m_Text:
LanguageIndex: 0
--- !u!1 &6499828782723189305
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 477558123132888962}
- component: {fileID: 5368454534996122911}
- component: {fileID: 5539683085737331267}
- component: {fileID: 3743641588999265012}
m_Layer: 5
m_Name: MContentroot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &477558123132888962
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6499828782723189305}
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: 813468935050872712}
m_Father: {fileID: 3459449779446077966}
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: 0, y: 0}
m_SizeDelta: {x: 800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5368454534996122911
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6499828782723189305}
m_CullTransparentMesh: 0
--- !u!114 &5539683085737331267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6499828782723189305}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, 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: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
--- !u!114 &3743641588999265012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6499828782723189305}
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 &6775969025563322831
GameObject:
m_ObjectHideFlags: 0
@ -470,7 +771,7 @@ RectTransform:
m_Children:
- {fileID: 3665110343844213319}
m_Father: {fileID: 3459449779446077966}
m_RootOrder: 1
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}
@ -674,7 +975,7 @@ RectTransform:
m_Children:
- {fileID: 5064823769683038666}
m_Father: {fileID: 3459449779446077966}
m_RootOrder: 0
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}
@ -726,3 +1027,111 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &8393792203962800333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 863404614654206844}
- component: {fileID: 4063587428838315981}
- component: {fileID: 5287820904852142347}
- component: {fileID: 6051710519634428906}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &863404614654206844
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8393792203962800333}
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: 3459449779446077966}
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 &4063587428838315981
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8393792203962800333}
m_CullTransparentMesh: 0
--- !u!114 &5287820904852142347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8393792203962800333}
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!114 &6051710519634428906
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8393792203962800333}
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: 5287820904852142347}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null

View File

@ -10251,7 +10251,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -10263,7 +10263,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8FDB\u53BB\u6218\u6597\u8FDB\u53BB\u6218\u6597\u8FDB\u53BB\u6218\u6597\u8FDB\u53BB\u6218\u6597"
m_Text:
LanguageIndex: 0
--- !u!1 &3715917534911146585
GameObject:
@ -20171,7 +20171,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_BestFit: 0
@ -20251,7 +20251,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_BestFit: 0
@ -20378,7 +20378,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
@ -20458,7 +20458,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
@ -58892,7 +58892,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: 135, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8127154594001898220
@ -58950,7 +58950,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5B9D\u83B2\u4F60\u4E2A\u5927\u706F"
m_Text:
LanguageIndex: 0
--- !u!1 &8348793177209857894
GameObject:

View File

@ -110,7 +110,6 @@ function DemonSlayerNewPanel:SetPlayer()
designation = allRankData[i].userTitle
}
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
LogGreen("curPlayerLiveViewData.userMount:"..tostring(curPlayerLiveViewData.userMount))
if curPlayerLiveViewData.ride and curPlayerLiveViewData.ride > 0 then
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT)
else

View File

@ -136,18 +136,18 @@ function this.SingleItemDataShow2(go, data,curShopDataId)
Util.GetGameObject(go, "zhe"):GetComponent("Image").sprite = this.spLoader:LoadSprite("s_shop_zhekou_0"..storeConfig.DiscountDegree.."_zh")
--LogError("ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID "..ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID)
Util.SetGray(Util.GetGameObject(go, "price"),storeConfig.Limit - data.buyNum <= 0)
Util.GetGameObject(go, "price/costIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID))
Util.GetGameObject(go, "price/Text"):GetComponent("Text").text = num
Util.GetGameObject(go, "price/Obj/costIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID))
Util.GetGameObject(go, "price/Obj/Text"):GetComponent("Text").text = num
local buyBtn = Util.GetGameObject(go,"price/btnBuy")
--LogGreen("storeConfig.Limit "..storeConfig.Limit.." "..data.buyNum)
if type == 3 then
Util.GetGameObject(go, "price/over"):SetActive(storeConfig.Limit - data.buyNum <= 0)
Util.GetGameObject(go, "price/Text"):SetActive(storeConfig.Limit - data.buyNum > 0)
Util.GetGameObject(go, "price/costIcon"):SetActive(storeConfig.Limit - data.buyNum > 0)
Util.GetGameObject(go, "price/Obj/Text"):SetActive(storeConfig.Limit - data.buyNum > 0)
Util.GetGameObject(go, "price/Obj/costIcon"):SetActive(storeConfig.Limit - data.buyNum > 0)
else
Util.GetGameObject(go, "price/over"):SetActive(false)
Util.GetGameObject(go, "price/Text"):SetActive(true)
Util.GetGameObject(go, "price/costIcon"):SetActive(true)
Util.GetGameObject(go, "price/Obj/Text"):SetActive(true)
Util.GetGameObject(go, "price/Obj/costIcon"):SetActive(true)
end
Util.AddOnceClick(buyBtn,function()
if type ~= 3 then

View File

@ -22,12 +22,20 @@ end
this.IsFirstOpenHarmonyBei = false
function this.EndlessGuideFun()
if not AppConst.isGuide then
LogGreen("不在引导内,不引导无尽")
return
end
table.insert(_FuncGuideList, 102600)
this.CheckFuncGuide()
end
function this.HongMengGuideFun(OnOff)
--鸿蒙碑开启引导
if not AppConst.isGuide then
LogGreen("不在引导内,不引导鸿蒙碑")
return
end
if OnOff == 1 then
UIManager.OpenPanel(UIName.MainPanel)
table.insert(_FuncGuideList, 101612)
@ -37,6 +45,10 @@ function this.HongMengGuideFun(OnOff)
end
function this.PracticeGuideFun()
if not AppConst.isGuide then
LogGreen("不在引导内,不引导神印")
return
end
table.insert(_FuncGuideList, 102500)
this.CheckFuncGuide()
end

View File

@ -14,6 +14,7 @@ this.helpBtnPosY=0
--初始化组件(用于子类重写)
function HelpPopup:InitComponent()
this.spLoader = SpriteLoader.New()
this.mask = Util.GetGameObject(self.gameObject,"mask")
this.RContentroot=Util.GetGameObject(self.gameObject,"RContentroot")
this.RContentrootRect=Util.GetGameObject(self.transform,"RContentroot"):GetComponent("RectTransform")--位置
@ -22,11 +23,17 @@ function HelpPopup:InitComponent()
this.LContentroot=Util.GetGameObject(self.gameObject,"LContentroot")
this.LContentrootRect=Util.GetGameObject(self.transform,"LContentroot"):GetComponent("RectTransform")
this.LContent=Util.GetGameObject(self.transform,"LContentroot/bg/LContent"):GetComponent("Text")
this.MContentroot=Util.GetGameObject(self.gameObject,"MContentroot")
this.MContentrootRect=Util.GetGameObject(self.transform,"MContentroot"):GetComponent("RectTransform")
this.MContent=Util.GetGameObject(self.transform,"MContentroot/bg/MContent"):GetComponent("Text")
end
--绑定事件(用于子类重写)
function HelpPopup:BindEvent()
Util.AddOnceClick(this.mask,function ()
this:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
@ -73,7 +80,7 @@ function HelpPopup:OnOpen(QAConfigID,posX,poxY)
UpdateBeat:Remove(update, this)
end
end
UpdateBeat:Add(update, this)
-- UpdateBeat:Add(update, this)--2020/10/29界面优化取消左右QA全部具中
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
@ -87,17 +94,16 @@ function HelpPopup:OnShow()
str = string.gsub(str,"|","\n")--换行
if this.helpBtnPosX>0 then
--Log("右")
--this.contentrootRect:DOPivotX(1,0)
this.RContentroot:SetActive(true)
-- this.RContentroot:SetActive(true)--2020/10/29界面优化取消左右QA全部具中
this.RContentrootRect.anchoredPosition=Vector3.New(this.helpBtnPosX-30,this.helpBtnPosY)
this.RContent.text=str
else
--Log("左")
--this.contentrootRect:DOPivotX(0,0)
this.LContentroot:SetActive(true)
-- this.LContentroot:SetActive(true)--2020/10/29界面优化取消左右QA全部具中
this.LContentrootRect.anchoredPosition=Vector3.New(this.helpBtnPosX+30,this.helpBtnPosY)
this.LContent.text=str
end
this.MContent.text=str
end
--界面关闭时调用(用于子类重写)

View File

@ -57,7 +57,7 @@ function this.RefreshPanel()
this.iconImage.sprite = this.spLoader:LoadSprite(ConfigManager.GetConfigData(ConfigName.ExpeditionNodeConfig,nodeType).Icon)
if nodeType == ExpeditionNodeType.Reply then--回复节点
this.titleText.text=Language[11545]
local num = ConfigManager.GetConfigData(ConfigName.ExpeditionSetting,1).RegeneratePercent/100
local num = ConfigManager.GetConfigData(ConfigName.ExpeditionSetting,1).RegeneratePercent/100
if nodeState == ExpeditionNodeState.No then
this.content.text = Language[11546]..num..Language[11547]
this.goBtnText.text = Language[10732]
@ -68,10 +68,10 @@ function this.RefreshPanel()
elseif nodeType == ExpeditionNodeType.Resurgence then--复活节点
this.titleText.text=Language[11549]
if nodeState == ExpeditionNodeState.No then
this.content.text = Language[11550]
this.content.text = "炼丹炉中炼制着一颗百转大还丹可随机复活一名阵亡的神将。如果没有阵亡的神将则使一名随机神将恢复至满生命值。"
this.goBtnText.text = Language[10732]
elseif nodeState == ExpeditionNodeState.NoPass then
this.content.text = Language[11550]
this.content.text = "炼丹炉中炼制着一颗百转大还丹可随机复活一名阵亡的神将。如果没有阵亡的神将则使一名随机神将恢复至满生命值。"
this.goBtnText.text = Language[10019]
end
end