新增TextTip
This commit is contained in:
shenjianxing
parent
d7dfada3fd
commit
46fb891186
File diff suppressed because one or more lines are too long
@ -90,6 +90,140 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_ShowMaskGraphic: 0
|
m_ShowMaskGraphic: 0
|
||||||
|
--- !u!1 &516545422650144405
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8624744625844656844}
|
||||||
|
- component: {fileID: 5404744622062144434}
|
||||||
|
- component: {fileID: 6702672503633474615}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Label
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8624744625844656844
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 516545422650144405}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4667911653019164219}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 100.05, y: -17}
|
||||||
|
m_SizeDelta: {x: 180.1, y: 34}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5404744622062144434
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 516545422650144405}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &6702672503633474615
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 516545422650144405}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 0
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 0}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_StyleSheet: {fileID: 0}
|
||||||
|
m_TextStyleHashCode: -1183493901
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontSize: 16
|
||||||
|
m_fontSizeBase: 16
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 0
|
||||||
|
m_HorizontalAlignment: 2
|
||||||
|
m_VerticalAlignment: 512
|
||||||
|
m_textAlignment: 65535
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
parentLinkedComponent: {fileID: 0}
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_IsTextObjectScaleStatic: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &1597918456588028124
|
--- !u!1 &1597918456588028124
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -105,7 +239,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &7214553111291442638
|
--- !u!224 &7214553111291442638
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -118,7 +252,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 9018706257419936416}
|
- {fileID: 4667911653019164219}
|
||||||
m_Father: {fileID: 7621766697555444520}
|
m_Father: {fileID: 7621766697555444520}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
@ -175,9 +309,9 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 5ed9b43aa6da2fd49af65b4ab0b85fc2, type: 3}
|
m_Script: {fileID: 11500000, guid: 5ed9b43aa6da2fd49af65b4ab0b85fc2, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
ContentText: {fileID: 5150898215778594440}
|
Des: {fileID: 5150898215778594440}
|
||||||
Content: {fileID: 8598386973860236803}
|
BtnContent: {fileID: 8598386973860236803}
|
||||||
Btn: {fileID: 2382537510885123284}
|
Btn: {fileID: 1491398146821546139}
|
||||||
--- !u!1 &3580616681696130763
|
--- !u!1 &3580616681696130763
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -191,7 +325,7 @@ GameObject:
|
|||||||
- component: {fileID: 5150898215778594440}
|
- component: {fileID: 5150898215778594440}
|
||||||
- component: {fileID: 4300610792594080258}
|
- component: {fileID: 4300610792594080258}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ContentText
|
m_Name: Des
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@ -212,9 +346,9 @@ RectTransform:
|
|||||||
m_Father: {fileID: 128517352014399093}
|
m_Father: {fileID: 128517352014399093}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 2.5986938, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: -5.1974, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7436760895064506146
|
--- !u!222 &7436760895064506146
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -244,7 +378,9 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text:
|
m_text: '
|
||||||
|
|
||||||
|
'
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||||
@ -326,7 +462,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
MarkType: 0
|
MarkType: 0
|
||||||
CustomComponentName:
|
CustomComponentName: ContentText
|
||||||
CustomComment:
|
CustomComment:
|
||||||
mComponentName: TMPro.TextMeshProUGUI
|
mComponentName: TMPro.TextMeshProUGUI
|
||||||
--- !u!1 &4085354983340029108
|
--- !u!1 &4085354983340029108
|
||||||
@ -418,7 +554,7 @@ GameObject:
|
|||||||
- component: {fileID: 5071511043202962173}
|
- component: {fileID: 5071511043202962173}
|
||||||
- component: {fileID: 1726680453458778962}
|
- component: {fileID: 1726680453458778962}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Content
|
m_Name: BtnContent
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@ -464,7 +600,7 @@ MonoBehaviour:
|
|||||||
m_Spacing: 25
|
m_Spacing: 25
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 1
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
m_ChildScaleWidth: 0
|
m_ChildScaleWidth: 0
|
||||||
m_ChildScaleHeight: 0
|
m_ChildScaleHeight: 0
|
||||||
@ -485,140 +621,6 @@ MonoBehaviour:
|
|||||||
CustomComponentName:
|
CustomComponentName:
|
||||||
CustomComment:
|
CustomComment:
|
||||||
mComponentName: RectTransform
|
mComponentName: RectTransform
|
||||||
--- !u!1 &4424332014873108154
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 5560325599401022954}
|
|
||||||
- component: {fileID: 3869491788675852741}
|
|
||||||
- component: {fileID: 6418527345240448528}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Label
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &5560325599401022954
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4424332014873108154}
|
|
||||||
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_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 9018706257419936416}
|
|
||||||
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 &3869491788675852741
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4424332014873108154}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &6418527345240448528
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4424332014873108154}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_text: "\u786E\u5B9A"
|
|
||||||
m_isRightToLeft: 0
|
|
||||||
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
|
||||||
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
|
||||||
m_fontSharedMaterials: []
|
|
||||||
m_fontMaterial: {fileID: 0}
|
|
||||||
m_fontMaterials: []
|
|
||||||
m_fontColor32:
|
|
||||||
serializedVersion: 2
|
|
||||||
rgba: 4294967295
|
|
||||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_enableVertexGradient: 0
|
|
||||||
m_colorMode: 3
|
|
||||||
m_fontColorGradient:
|
|
||||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_fontColorGradientPreset: {fileID: 0}
|
|
||||||
m_spriteAsset: {fileID: 0}
|
|
||||||
m_tintAllSprites: 0
|
|
||||||
m_StyleSheet: {fileID: 0}
|
|
||||||
m_TextStyleHashCode: -1183493901
|
|
||||||
m_overrideHtmlColors: 0
|
|
||||||
m_faceColor:
|
|
||||||
serializedVersion: 2
|
|
||||||
rgba: 4294967295
|
|
||||||
m_fontSize: 16
|
|
||||||
m_fontSizeBase: 16
|
|
||||||
m_fontWeight: 400
|
|
||||||
m_enableAutoSizing: 0
|
|
||||||
m_fontSizeMin: 18
|
|
||||||
m_fontSizeMax: 72
|
|
||||||
m_fontStyle: 0
|
|
||||||
m_HorizontalAlignment: 2
|
|
||||||
m_VerticalAlignment: 512
|
|
||||||
m_textAlignment: 65535
|
|
||||||
m_characterSpacing: 0
|
|
||||||
m_wordSpacing: 0
|
|
||||||
m_lineSpacing: 0
|
|
||||||
m_lineSpacingMax: 0
|
|
||||||
m_paragraphSpacing: 0
|
|
||||||
m_charWidthMaxAdj: 0
|
|
||||||
m_enableWordWrapping: 1
|
|
||||||
m_wordWrappingRatios: 0.4
|
|
||||||
m_overflowMode: 0
|
|
||||||
m_linkedTextComponent: {fileID: 0}
|
|
||||||
parentLinkedComponent: {fileID: 0}
|
|
||||||
m_enableKerning: 1
|
|
||||||
m_enableExtraPadding: 0
|
|
||||||
checkPaddingRequired: 0
|
|
||||||
m_isRichText: 1
|
|
||||||
m_parseCtrlCharacters: 1
|
|
||||||
m_isOrthographic: 1
|
|
||||||
m_isCullingEnabled: 0
|
|
||||||
m_horizontalMapping: 0
|
|
||||||
m_verticalMapping: 0
|
|
||||||
m_uvLineOffset: 0
|
|
||||||
m_geometrySortingOrder: 0
|
|
||||||
m_IsTextObjectScaleStatic: 0
|
|
||||||
m_VertexBufferAutoSizeReduction: 0
|
|
||||||
m_useMaxVisibleDescender: 1
|
|
||||||
m_pageToDisplay: 1
|
|
||||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_isUsingLegacyAnimationComponent: 0
|
|
||||||
m_isVolumetricText: 0
|
|
||||||
m_hasFontAssetChanged: 0
|
|
||||||
m_baseMaterial: {fileID: 0}
|
|
||||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
--- !u!1 &4469038750498708236
|
--- !u!1 &4469038750498708236
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -681,19 +683,19 @@ RectTransform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4572441839148889085}
|
m_GameObject: {fileID: 4572441839148889085}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8658193432342698965}
|
- {fileID: 8658193432342698965}
|
||||||
- {fileID: 3919029358455090348}
|
- {fileID: 3919029358455090348}
|
||||||
m_Father: {fileID: 2372163848171535652}
|
m_Father: {fileID: 530869619305514304}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0.041015625, y: 20.267822}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: -60.053955, y: -153.81448}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5728085180163471510
|
--- !u!222 &5728085180163471510
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -793,7 +795,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 2372163848171535652}
|
- {fileID: 503948904615403453}
|
||||||
- {fileID: 8598386973860236803}
|
- {fileID: 8598386973860236803}
|
||||||
m_Father: {fileID: 7621766697555444520}
|
m_Father: {fileID: 7621766697555444520}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -850,6 +852,8 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 128517352014399093}
|
- component: {fileID: 128517352014399093}
|
||||||
- component: {fileID: 3267219559313294048}
|
- component: {fileID: 3267219559313294048}
|
||||||
|
- component: {fileID: 6329282563270693876}
|
||||||
|
- component: {fileID: 5452380971285564101}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Content
|
m_Name: Content
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -875,7 +879,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 300}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &3267219559313294048
|
--- !u!114 &3267219559313294048
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -890,42 +894,46 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_ShowMaskGraphic: 1
|
m_ShowMaskGraphic: 1
|
||||||
--- !u!1 &6512003083898758255
|
--- !u!114 &6329282563270693876
|
||||||
GameObject:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
m_GameObject: {fileID: 6117686575623656590}
|
||||||
m_Component:
|
m_Enabled: 1
|
||||||
- component: {fileID: 2372163848171535652}
|
m_EditorHideFlags: 0
|
||||||
m_Layer: 5
|
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||||
m_Name: TrainExplainBG
|
m_Name:
|
||||||
m_TagString: Untagged
|
m_EditorClassIdentifier:
|
||||||
m_Icon: {fileID: 0}
|
m_Padding:
|
||||||
m_NavMeshLayer: 0
|
m_Left: 0
|
||||||
m_StaticEditorFlags: 0
|
m_Right: 0
|
||||||
m_IsActive: 1
|
m_Top: 0
|
||||||
--- !u!224 &2372163848171535652
|
m_Bottom: 0
|
||||||
RectTransform:
|
m_ChildAlignment: 1
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 1
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 1
|
||||||
|
m_ChildControlHeight: 1
|
||||||
|
m_ChildScaleWidth: 1
|
||||||
|
m_ChildScaleHeight: 0
|
||||||
|
m_ReverseArrangement: 0
|
||||||
|
--- !u!114 &5452380971285564101
|
||||||
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 6512003083898758255}
|
m_GameObject: {fileID: 6117686575623656590}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_Enabled: 1
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_EditorHideFlags: 0
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||||
m_ConstrainProportionsScale: 0
|
m_Name:
|
||||||
m_Children:
|
m_EditorClassIdentifier:
|
||||||
- {fileID: 503948904615403453}
|
m_HorizontalFit: 0
|
||||||
m_Father: {fileID: 530869619305514304}
|
m_VerticalFit: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.036000002, y: 0.22750628}
|
|
||||||
m_AnchorMax: {x: 0.96873003, y: 0.7524938}
|
|
||||||
m_AnchoredPosition: {x: -2, y: 24.2578}
|
|
||||||
m_SizeDelta: {x: -2, y: 35.7155}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!1 &6725991522515915578
|
--- !u!1 &6725991522515915578
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1001,7 +1009,7 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
--- !u!1 &7095592620248043999
|
--- !u!1 &7021573369064059479
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@ -1009,11 +1017,12 @@ GameObject:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 9018706257419936416}
|
- component: {fileID: 4667911653019164219}
|
||||||
- component: {fileID: 8186035713755879833}
|
- component: {fileID: 6746097905975640291}
|
||||||
- component: {fileID: 1119753793702893527}
|
- component: {fileID: 7462750095841437091}
|
||||||
- component: {fileID: 2382537510885123284}
|
- component: {fileID: 1491398146821546139}
|
||||||
- component: {fileID: 7952288152739983810}
|
- component: {fileID: 1772871977037243942}
|
||||||
|
- component: {fileID: 1517882589546779953}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Btn
|
m_Name: Btn
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -1021,41 +1030,41 @@ GameObject:
|
|||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!224 &9018706257419936416
|
--- !u!224 &4667911653019164219
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7095592620248043999}
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5560325599401022954}
|
- {fileID: 8624744625844656844}
|
||||||
m_Father: {fileID: 7214553111291442638}
|
m_Father: {fileID: 7214553111291442638}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 50, y: -199.5}
|
m_AnchoredPosition: {x: 50, y: -199.5}
|
||||||
m_SizeDelta: {x: 102, y: 34}
|
m_SizeDelta: {x: 200.1, y: 34}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8186035713755879833
|
--- !u!222 &6746097905975640291
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7095592620248043999}
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!114 &1119753793702893527
|
--- !u!114 &7462750095841437091
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7095592620248043999}
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
@ -1079,13 +1088,13 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
--- !u!114 &2382537510885123284
|
--- !u!114 &1491398146821546139
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7095592620248043999}
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
@ -1119,26 +1128,52 @@ MonoBehaviour:
|
|||||||
m_SelectedTrigger: Selected
|
m_SelectedTrigger: Selected
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 1119753793702893527}
|
m_TargetGraphic: {fileID: 7462750095841437091}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!114 &7952288152739983810
|
--- !u!114 &1772871977037243942
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7095592620248043999}
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
|
m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
MarkType: 0
|
MarkType: 0
|
||||||
CustomComponentName:
|
CustomComponentName: Btn
|
||||||
CustomComment:
|
CustomComment:
|
||||||
mComponentName: UnityEngine.UI.Button
|
mComponentName: UnityEngine.UI.Button
|
||||||
|
--- !u!114 &1517882589546779953
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7021573369064059479}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 10
|
||||||
|
m_Right: 10
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 4
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 1
|
||||||
|
m_ChildControlWidth: 1
|
||||||
|
m_ChildControlHeight: 0
|
||||||
|
m_ChildScaleWidth: 1
|
||||||
|
m_ChildScaleHeight: 0
|
||||||
|
m_ReverseArrangement: 0
|
||||||
--- !u!1 &7781243942170075834
|
--- !u!1 &7781243942170075834
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1259,8 +1294,8 @@ MonoBehaviour:
|
|||||||
m_TargetGraphic: {fileID: 357004401929925880}
|
m_TargetGraphic: {fileID: 357004401929925880}
|
||||||
m_HandleRect: {fileID: 3597609257727713667}
|
m_HandleRect: {fileID: 3597609257727713667}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1
|
m_Value: 0
|
||||||
m_Size: 0.81728506
|
m_Size: 1
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|||||||
@ -3,6 +3,7 @@ using QFramework.Example;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Unity.Burst.CompilerServices;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using XMLTool;
|
using XMLTool;
|
||||||
|
|
||||||
@ -87,9 +88,6 @@ public class ActionHelper
|
|||||||
return LogAction.Allocate(action.Value);
|
return LogAction.Allocate(action.Value);
|
||||||
case "Delay":
|
case "Delay":
|
||||||
return ActionKit.Delay(float.Parse(action.Value), null);
|
return ActionKit.Delay(float.Parse(action.Value), null);
|
||||||
case "UIShow":
|
|
||||||
var strAct = (XMLTool.StringListAction)act;
|
|
||||||
return UIShowAction.Allocate(strAct.Value, strAct.args[0]);
|
|
||||||
case "NextOperation":
|
case "NextOperation":
|
||||||
return NextOperationAction.Allocate();
|
return NextOperationAction.Allocate();
|
||||||
case "Move":
|
case "Move":
|
||||||
@ -104,28 +102,49 @@ public class ActionHelper
|
|||||||
var anim = (XMLTool.AnimationAction)act;
|
var anim = (XMLTool.AnimationAction)act;
|
||||||
return QFramework.AnimationAction.Allocate(anim.Value, anim.animName);
|
return QFramework.AnimationAction.Allocate(anim.Value, anim.animName);
|
||||||
case "UITools":
|
case "UITools":
|
||||||
var strAction = (XMLTool.StringListAction)act;
|
{
|
||||||
return UIToolsAction.Allocate(strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3],
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
strAction.args[4], strAction.args[5], strAction.args[6], strAction.args[7],
|
return UIToolsAction.Allocate(strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3],
|
||||||
strAction.args[8], strAction.args[9]);
|
strAction.args[4], strAction.args[5], strAction.args[6], strAction.args[7],
|
||||||
|
strAction.args[8], strAction.args[9]);
|
||||||
|
}
|
||||||
case "PointQuestion":
|
case "PointQuestion":
|
||||||
return PointQuestionAction.Allocate(act.Value);
|
return PointQuestionAction.Allocate(act.Value);
|
||||||
case "TextQuestion":
|
case "TextQuestion":
|
||||||
var textQuestion = (XMLTool.StringListAction)act;
|
{
|
||||||
return TextQuestionAction.Allocate(textQuestion.args[0], textQuestion.args[1], textQuestion.args[2], textQuestion.args[3], textQuestion.args[4], textQuestion.args[5]);
|
|
||||||
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return TextQuestionAction.Allocate(strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3], strAction.args[4], strAction.args[5]);
|
||||||
|
}
|
||||||
case "Hint":
|
case "Hint":
|
||||||
var hint = (XMLTool.StringListAction)act;
|
{
|
||||||
return HintAction.Allocate(hint.Value, hint.args[0], hint.args[1], hint.args[2]);
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return HintAction.Allocate(strAction.Value, strAction.args[0], strAction.args[1], strAction.args[2]);
|
||||||
|
}
|
||||||
case "Var":
|
case "Var":
|
||||||
return SetVarAction.Allocate(act.Name, act.Value);
|
return SetVarAction.Allocate(act.Name, act.Value);
|
||||||
case "Show":
|
case "Show":
|
||||||
var show = (XMLTool.StringListAction)act;
|
{
|
||||||
return ShowAction.Allocate(act.Value, show.args[0]);
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return ShowAction.Allocate(act.Value, strAction.args[0]);
|
||||||
|
}
|
||||||
|
case "TextTip":
|
||||||
|
{
|
||||||
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return TextTipAction.Allocate(act.Value, strAction.args[0]);
|
||||||
|
}
|
||||||
|
case "UIShow":
|
||||||
|
{
|
||||||
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return UIShowAction.Allocate(act.Value, strAction.args[0]);
|
||||||
|
}
|
||||||
case "SetScore":
|
case "SetScore":
|
||||||
return SetScoreAction.Allocate(act.Name, act.Value);
|
return SetScoreAction.Allocate(act.Name, act.Value);
|
||||||
case "CameraSwitch":
|
case "CameraSwitch":
|
||||||
var cs = (XMLTool.StringListAction)act;
|
{
|
||||||
return CameraSwitchAction.Allocate(cs.args[0], cs.args[1], cs.args[2], cs.args[3], cs.args[4], cs.args[5], cs.args[6]);
|
var strAction = (XMLTool.StringListAction)act;
|
||||||
|
return CameraSwitchAction.Allocate(strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3], strAction.args[4], strAction.args[5], strAction.args[6]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case XMLTool.Condition condition:
|
case XMLTool.Condition condition:
|
||||||
|
|||||||
63
Assets/Scripts/Actions/TextTipAction.cs
Normal file
63
Assets/Scripts/Actions/TextTipAction.cs
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using QFramework;
|
||||||
|
using System;
|
||||||
|
using QFramework.Example;
|
||||||
|
using System.Linq;
|
||||||
|
using Unity.VisualScripting;
|
||||||
|
public class TextTipAction : IAction
|
||||||
|
{
|
||||||
|
public ulong ActionID { get; set; }
|
||||||
|
public bool Deinited { get; set; }
|
||||||
|
public bool Paused { get; set; }
|
||||||
|
public ActionStatus Status { get; set; }
|
||||||
|
|
||||||
|
private static readonly SimpleObjectPool<TextTipAction> mPool =
|
||||||
|
new SimpleObjectPool<TextTipAction>(() => new TextTipAction(), null, 10);
|
||||||
|
string text = string.Empty;
|
||||||
|
string btns = string.Empty;
|
||||||
|
public static TextTipAction Allocate(string text, string btns, System.Action onDelayFinish = null)
|
||||||
|
{
|
||||||
|
var retNode = mPool.Allocate();
|
||||||
|
retNode.ActionID = ActionKit.ID_GENERATOR++;
|
||||||
|
retNode.Deinited = false;
|
||||||
|
retNode.Reset();
|
||||||
|
retNode.text = text;
|
||||||
|
retNode.btns = btns;
|
||||||
|
return retNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public void Deinit()
|
||||||
|
{
|
||||||
|
if (!Deinited)
|
||||||
|
{
|
||||||
|
Deinited = true;
|
||||||
|
mPool.Recycle(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnExecute(float dt)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnFinish()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnStart()
|
||||||
|
{
|
||||||
|
UITextTipData data = new UITextTipData();
|
||||||
|
data.text = text;
|
||||||
|
data.btns = btns.Split(',').ToList();
|
||||||
|
UIKit.OpenPanelAsync<UITextTip>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Reset()
|
||||||
|
{
|
||||||
|
Status = ActionStatus.NotStart;
|
||||||
|
Paused = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/Actions/TextTipAction.cs.meta
Normal file
11
Assets/Scripts/Actions/TextTipAction.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bfa1b43bf31bd7d419030b19cefe1053
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
10
Assets/Scripts/UI/UITextTip.Designer.cs
generated
10
Assets/Scripts/UI/UITextTip.Designer.cs
generated
@ -5,15 +5,15 @@ using QFramework;
|
|||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
// Generate Id:7d975b20-e244-4bcd-ac20-ccedeb0360cd
|
// Generate Id:6e5ebb38-7352-4359-a698-28a6e4ca3f0f
|
||||||
public partial class UITextTip
|
public partial class UITextTip
|
||||||
{
|
{
|
||||||
public const string Name = "UITextTip";
|
public const string Name = "UITextTip";
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public TMPro.TextMeshProUGUI ContentText;
|
public TMPro.TextMeshProUGUI Des;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public RectTransform Content;
|
public RectTransform BtnContent;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public UnityEngine.UI.Button Btn;
|
public UnityEngine.UI.Button Btn;
|
||||||
|
|
||||||
@ -21,8 +21,8 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
protected override void ClearUIComponents()
|
protected override void ClearUIComponents()
|
||||||
{
|
{
|
||||||
ContentText = null;
|
Des = null;
|
||||||
Content = null;
|
BtnContent = null;
|
||||||
Btn = null;
|
Btn = null;
|
||||||
|
|
||||||
mData = null;
|
mData = null;
|
||||||
|
|||||||
@ -1,34 +1,53 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using QFramework;
|
using QFramework;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using TMPro;
|
||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
public class UITextTipData : UIPanelData
|
public class UITextTipData : UIPanelData
|
||||||
{
|
{
|
||||||
}
|
public string text;
|
||||||
public partial class UITextTip : UIPanel
|
|
||||||
{
|
public List<string> btns;
|
||||||
protected override void OnInit(IUIData uiData = null)
|
}
|
||||||
{
|
public partial class UITextTip : UIPanel
|
||||||
mData = uiData as UITextTipData ?? new UITextTipData();
|
{
|
||||||
// please add init code here
|
protected override void OnInit(IUIData uiData = null)
|
||||||
}
|
{
|
||||||
|
|
||||||
protected override void OnOpen(IUIData uiData = null)
|
mData = uiData as UITextTipData ?? new UITextTipData();
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnShow()
|
protected override void OnOpen(IUIData uiData = null)
|
||||||
{
|
{
|
||||||
}
|
mData = uiData as UITextTipData ?? new UITextTipData();
|
||||||
|
Des.text = mData.text;
|
||||||
protected override void OnHide()
|
BtnContent.RemoveAllChildren();
|
||||||
{
|
foreach (var item in mData.btns)
|
||||||
}
|
{
|
||||||
|
GameObject btn = GameObject.Instantiate(Btn.gameObject, BtnContent);
|
||||||
protected override void OnClose()
|
btn.transform.Find("Label").GetComponent<TextMeshProUGUI>().text = item;
|
||||||
{
|
btn.name = item;
|
||||||
}
|
btn.GetComponent<Button>().onClick.AddListener(() =>
|
||||||
}
|
{
|
||||||
|
Hide();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnShow()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnHide()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnClose()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -548,6 +548,22 @@ namespace XMLTool
|
|||||||
newAction = act;
|
newAction = act;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "TextTip":
|
||||||
|
{
|
||||||
|
var act = new StringListAction();
|
||||||
|
XAttribute btns = action.Attribute("btns");
|
||||||
|
if (btns != null)
|
||||||
|
{
|
||||||
|
act.args.Add(btns.Value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
act.args.Add("");
|
||||||
|
}
|
||||||
|
|
||||||
|
newAction = act;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
newAction = new Action();
|
newAction = new Action();
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -733,7 +733,7 @@
|
|||||||
</Reset>
|
</Reset>
|
||||||
<Start>
|
<Start>
|
||||||
<Action type="Sequence">
|
<Action type="Sequence">
|
||||||
<Action type="Log" value="2222"></Action>
|
<Action type="TextTip" value="这里是文字描述" btns="确定,取消"/>
|
||||||
<Action type="Move" value="Main Camera" to="-3.206,3.24,-1.425" time="0"></Action>
|
<Action type="Move" value="Main Camera" to="-3.206,3.24,-1.425" time="0"></Action>
|
||||||
<Action type="Rotate" value="Main Camera" to="27.9597,270,2.899792E-06" time="0"></Action>
|
<Action type="Rotate" value="Main Camera" to="27.9597,270,2.899792E-06" time="0"></Action>
|
||||||
<Action type="Btns" value="下一步"></Action>
|
<Action type="Btns" value="下一步"></Action>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user