合并

Assets/Art/UIPrefab/UIInstruction.prefab

@@ -179,6 +179,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &963341410792452669
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8306813097888173733}
+  - component: {fileID: 3837189004134352734}
+  - component: {fileID: 7614384700572048380}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8306813097888173733
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963341410792452669}
+  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: 248141855332757782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 86.7, y: 0}
+  m_SizeDelta: {x: 125.9408, y: 26.6775}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3837189004134352734
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963341410792452669}
+  m_CullTransparentMesh: 1
+--- !u!114 &7614384700572048380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963341410792452669}
+  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: "\u4E0D\u5728\u5F39\u51FA"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, 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: 14
+  m_fontSizeBase: 14
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  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 &965987611090981841
 GameObject:
   m_ObjectHideFlags: 0
@@ -471,6 +605,83 @@ MonoBehaviour:
   ContentText: {fileID: 2630179459340483145}
   OperationContent: {fileID: 3768800539522999701}
   ConfirmBtn: {fileID: 783019177237190269}
+  NoToggle: {fileID: 348326873578363908}
+--- !u!1 &2503928927472218135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8122422719238859266}
+  - component: {fileID: 6943201433567018558}
+  - component: {fileID: 9120054127247695426}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8122422719238859266
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2503928927472218135}
+  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:
+  - {fileID: 7220735263378127805}
+  m_Father: {fileID: 248141855332757782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: -10}
+  m_SizeDelta: {x: 15, y: 14}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6943201433567018558
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2503928927472218135}
+  m_CullTransparentMesh: 1
+--- !u!114 &9120054127247695426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2503928927472218135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9464ca413b2bcb04cb493e10e581608c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2550146359932684284
 GameObject:
   m_ObjectHideFlags: 0
@@ -574,6 +785,81 @@ MonoBehaviour:
   CustomComponentName: 
   CustomComment: 
   mComponentName: UnityEngine.UI.Toggle
+--- !u!1 &2570030987872014484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7220735263378127805}
+  - component: {fileID: 8195180130690482555}
+  - component: {fileID: 9078779131021137493}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7220735263378127805
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570030987872014484}
+  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: 8122422719238859266}
+  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: 11, y: 7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8195180130690482555
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570030987872014484}
+  m_CullTransparentMesh: 1
+--- !u!114 &9078779131021137493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570030987872014484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 602c10f94513ff948ae3265e93663fd0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3022383873887137971
 GameObject:
   m_ObjectHideFlags: 0
@@ -874,6 +1160,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3928332711450143475
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5035779744222043849}
+  - component: {fileID: 3606052736764112539}
+  - component: {fileID: 1180986773106598373}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5035779744222043849
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3928332711450143475}
+  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: 2372316975154564413}
+  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: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3606052736764112539
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3928332711450143475}
+  m_CullTransparentMesh: 1
+--- !u!114 &1180986773106598373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3928332711450143475}
+  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: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, 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 &3987550854091427406
 GameObject:
   m_ObjectHideFlags: 0
@@ -1088,7 +1508,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4372367197721826394}
+  - {fileID: 5035779744222043849}
   m_Father: {fileID: 4839883224716733706}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -1230,7 +1650,7 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &5331334700477330333
+--- !u!1 &4335738970878834065
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1238,77 +1658,101 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4372367197721826394}
+  - component: {fileID: 248141855332757782}
-  - component: {fileID: 4841981992143538647}
+  - component: {fileID: 348326873578363908}
-  - component: {fileID: 1789336353052483050}
+  - component: {fileID: 5533678330431192180}
   m_Layer: 5
-  m_Name: 'Text '
+  m_Name: NoToggle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4372367197721826394
+--- !u!224 &248141855332757782
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5331334700477330333}
+  m_GameObject: {fileID: 4335738970878834065}
   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_Children:
-  m_Father: {fileID: 2372316975154564413}
+  - {fileID: 8122422719238859266}
+  - {fileID: 8306813097888173733}
+  m_Father: {fileID: 4839883224716733706}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 155, y: -152}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4841981992143538647
+--- !u!114 &348326873578363908
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5331334700477330333}
-  m_CullTransparentMesh: 1
---- !u!114 &1789336353052483050
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5331334700477330333}
+  m_GameObject: {fileID: 4335738970878834065}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Navigation:
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+    m_Mode: 3
-  m_RaycastTarget: 1
+    m_WrapAround: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+    m_SelectOnUp: {fileID: 0}
-  m_Maskable: 1
+    m_SelectOnDown: {fileID: 0}
-  m_OnCullStateChanged:
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 9120054127247695426}
+  toggleTransition: 1
+  graphic: {fileID: 9078779131021137493}
+  m_Group: {fileID: 0}
+  onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
+  m_IsOn: 0
-    m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3}
+--- !u!114 &5533678330431192180
-    m_FontSize: 16
+MonoBehaviour:
-    m_FontStyle: 0
+  m_ObjectHideFlags: 0
-    m_BestFit: 0
+  m_CorrespondingSourceObject: {fileID: 0}
-    m_MinSize: 1
+  m_PrefabInstance: {fileID: 0}
-    m_MaxSize: 40
+  m_PrefabAsset: {fileID: 0}
-    m_Alignment: 4
+  m_GameObject: {fileID: 4335738970878834065}
-    m_AlignByGeometry: 0
+  m_Enabled: 1
-    m_RichText: 1
+  m_EditorHideFlags: 0
-    m_HorizontalOverflow: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
-    m_VerticalOverflow: 0
+  m_Name: 
-    m_LineSpacing: 1
+  m_EditorClassIdentifier: 
-  m_Text: "\u786E\u5B9A"
+  MarkType: 0
+  CustomComponentName: 
+  CustomComment: 
+  mComponentName: UnityEngine.UI.Toggle
 --- !u!1 &5793951295459804211
 GameObject:
   m_ObjectHideFlags: 0
@@ -2073,6 +2517,7 @@ RectTransform:
   - {fileID: 5869372504899619242}
   - {fileID: 3938101680096514251}
   - {fileID: 2372316975154564413}
+  - {fileID: 248141855332757782}
   m_Father: {fileID: 293141910494228245}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Art/UIPrefab/UITipWindow.prefab

@@ -652,8 +652,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 20
-    m_Right: 0
+    m_Right: 20
     m_Top: 20
     m_Bottom: 0
   m_ChildAlignment: 1

Assets/Art/UITextures/UIInstruction/反复弹出Tog.png.meta

@@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 9464ca413b2bcb04cb493e10e581608c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UITextures/UIInstruction/反复弹出对号Tog.png.meta

@@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 602c10f94513ff948ae3265e93663fd0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Draw/Scripts/ScreenShotPainter.cs

@@ -2,15 +2,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Net;
-using System.Security.Cryptography;
-using UnityEditor.Rendering;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using UnityEngine.Rendering;
 using UnityEngine.UI;
-using static UnityEditor.Progress;
 
 [RequireComponent(typeof(Camera))]
 public class ScreenShotPainter : MonoBehaviour

Assets/Plugins/Aspose.Words.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: ba16243601d48674bbd94478034635d0
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.CJK.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: 011acf0a952213a4b97dec494970b89c
+timeCreated: 1557824456
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.MidEast.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: 7753f3b607b83164cbf74e2e36d090c9
+timeCreated: 1557824457
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.Other.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: 9c94780bdbcb48240b70f6c632e3fb73
+timeCreated: 1557824458
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.Rare.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: 6c8687baf70c2e44899226fcf87bd57b
+timeCreated: 1557824457
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.West.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: f97ed92fe8f098e40835de50638f9bfb
+timeCreated: 1557824458
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/I18N.dll.meta

@@ -0,0 +1,105 @@
+fileFormatVersion: 2
+guid: 69712f7176d85a4428351b6b7cb03045
+timeCreated: 1557824456
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    data:
+      first:
+        Any: 
+      second:
+        enabled: 1
+        settings: {}
+    data:
+      first:
+        Editor: Editor
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+          DefaultValueInitialized: true
+    data:
+      first:
+        Facebook: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Facebook: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: Linux
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Linux64
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: LinuxUniversal
+      second:
+        enabled: 1
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: OSXIntel
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: OSXIntel64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Standalone: OSXUniversal
+      second:
+        enabled: 0
+        settings:
+          CPU: x86_64
+    data:
+      first:
+        Standalone: Win
+      second:
+        enabled: 0
+        settings:
+          CPU: None
+    data:
+      first:
+        Standalone: Win64
+      second:
+        enabled: 1
+        settings:
+          CPU: AnyCPU
+    data:
+      first:
+        Windows Store Apps: WindowsStoreApps
+      second:
+        enabled: 0
+        settings:
+          CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/System.Windows.Forms.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 82549cd4bc10d654d876aaf0f7f4b64d
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Main.unity

@@ -136,6 +136,8 @@ GameObject:
   - component: {fileID: 547432241}
   - component: {fileID: 547432240}
   - component: {fileID: 547432239}
+  - component: {fileID: 547432238}
+  - component: {fileID: 547432237}
   - component: {fileID: 547432236}
   - component: {fileID: 547432244}
   - component: {fileID: 547432245}
@@ -164,6 +166,56 @@ MonoBehaviour:
   enableCollision: 1
   isMov: 1
   isRot: 1
+--- !u!54 &547432237
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 547432235}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!136 &547432238
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 547432235}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1.0228593
+  m_Height: 2.045719
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &547432239
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -255,7 +307,7 @@ Camera:
     y: 0
     width: 1
     height: 1
-  near clip plane: 0.01
+  near clip plane: 0.3
   far clip plane: 1000
   field of view: 60
   orthographic: 0
@@ -283,13 +335,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 547432235}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.059811153, y: 0.9234663, z: -0.16098467, w: 0.34309843}
-  m_LocalPosition: {x: 0.77, y: 1.978, z: 0}
+  m_LocalPosition: {x: -4.2800546, y: 3.0786743, z: 3.6917665}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 19.976, y: 11.67, z: 0}
 --- !u!114 &547432244
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -323,9 +375,9 @@ CharacterController:
   m_Enabled: 1
   serializedVersion: 3
   m_Height: 0.13
-  m_Radius: 0.003
+  m_Radius: 0.03
   m_SlopeLimit: 10
-  m_StepOffset: 0.01
+  m_StepOffset: 0.1
   m_SkinWidth: 0.0001
   m_MinMoveDistance: 0.001
   m_Center: {x: 0, y: 0, z: 0}

Assets/Scripts/Actions/MatAction.cs

@@ -60,7 +60,22 @@ namespace QFramework
             int.TryParse(index, out matIndex);
             if (string.IsNullOrEmpty(matName) == false)
             {
-                mesh.materials[matIndex] = Resources.Load<Material>("Mat/" + matName);
+                //mesh.materials[matIndex].CopyMatchingPropertiesFromMaterial();
+                var mat = Resources.Load<Material>("Mat/" + matName);
+                var mats = new Material[mesh.materials.Length];
+                for (int i = 0; i < mesh.materials.Length; i++)
+                {
+                    if (i == matIndex)
+                    {
+                        mats[i] = mat;
+                    }
+                    else
+                    {
+                        mats[i] = mesh.materials[i];
+                    }
+                }
+
+                mesh.materials = mats;
             }
             if (mainTexture != null)
             {

Assets/Scripts/Actions/TimeLineAction.cs

@@ -22,6 +22,7 @@ public class TimeLineAction : IAction
     string frame;
     string endFrame;
     float curEndFrame = -1;
+    string speed = "1";
     GameObject obj = null;
     PlayableDirector play = null;
     float fps = 24;
@@ -38,6 +39,7 @@ public class TimeLineAction : IAction
         retNode.isWait = datas.ContainsKey("isWait") ? datas["isWait"] : "true";
         retNode.frame = datas.ContainsKey("frame") ? datas["frame"] : string.Empty;
         retNode.endFrame = datas.ContainsKey("endFrame") ? datas["endFrame"] : string.Empty;
+        retNode.speed = datas.ContainsKey("speed") ? datas["speed"] : string.Empty;
         retNode.curEndFrame = -1;
         retNode.play = null;
         return retNode;
@@ -62,6 +64,7 @@ public class TimeLineAction : IAction
         {
             play.Stop();
             play.time = curEndFrame / 24;
+            play.Evaluate();
         }
         if (play.state != PlayState.Playing)
         {
@@ -102,12 +105,36 @@ public class TimeLineAction : IAction
                     float.TryParse(frame, out curFrame);
                 }
                 play.time = curFrame / fps;
-                play.Play();
+                float curSpeed = 1;
+                if (float.TryParse(speed, out curSpeed) == false)
+                {
+                    curSpeed = 1;
+                }
+
 
                 if (string.IsNullOrEmpty(endFrame) == false)
                 {
                     float.TryParse(endFrame, out curEndFrame);
                 }
+
+                if (!play.playableGraph.IsValid())
+                {
+                    play.RebuildGraph();
+                }
+                if (curFrame == curEndFrame)
+                {
+                    play.time = curEndFrame / 24;
+                    play.Evaluate();
+                    Finished();
+                }
+                else
+                {
+
+                    play.playableGraph.GetRootPlayable(0).SetSpeed(curSpeed);
+                    play.Play();
+                }
+
+
                 bool iswait = true;
                 bool.TryParse(isWait, out iswait);
                 if (iswait == false)

Assets/Scripts/Controller/ScoreController.cs

@@ -83,6 +83,10 @@ public class ScoreController : MonoSingleton<ScoreController>
                 scoreDict[key].value = 0;
             }
         }
+        else
+        {
+            Debug.LogError("没有找到 评分点：" + key);
+        }
     }
 
 

Assets/Scripts/FreeCameraController.cs

@@ -22,12 +22,17 @@ public class FreeCameraController : MonoBehaviour
     private float yRotation = 0.0f;
     public bool isMov = true;
     public bool isRot = true;
-
+    CharacterController ctrlor;
     private void Awake()
     {
         instance = this;
         DontDestroyOnLoad(this);
         
+       // Cm = GameObject.Find("Mcam");
+        ctrlor = GetComponent<CharacterController>();
+
+
+
         Global.appSetting.MouseMoveSpeed.RegisterWithInitValue(v => rotateSpeed = v);
     }
    /// <summary>
@@ -53,15 +58,55 @@ public class FreeCameraController : MonoBehaviour
     {
         if (isMov)
         {
-            // 相机移动
+            //// 相机移动
-            float horizontal = Input.GetAxis("Horizontal") * moveSpeed * Time.deltaTime;
+            //float horizontal = Input.GetAxis("Horizontal") * moveSpeed * Time.deltaTime;
-            float vertical = Input.GetAxis("Vertical") * moveSpeed * Time.deltaTime;
+            //float vertical = Input.GetAxis("Vertical") * moveSpeed * Time.deltaTime;
 
-            Vector3 move = transform.right * horizontal + transform.forward * vertical;
+            //Vector3 move = transform.right * horizontal + transform.forward * vertical;
 
-            transform.position += move;
+            //transform.position += move;
-            //添加相机QE上下移动功能
+
-            transform.position+= GetInputTranslationDirection()*0.004f;
+
+            //W键前进
+            if (Input.GetKey(KeyCode.W))
+            {
+                Vector3 forward = transform.TransformDirection(Vector3.forward);
+                ctrlor.Move(forward * moveSpeed * Time.deltaTime);
+
+            }
+            //S键后退
+            if (Input.GetKey(KeyCode.S))
+            {
+                Vector3 back = transform.TransformDirection(Vector3.back);
+                ctrlor.Move(back * moveSpeed * Time.deltaTime);
+
+            }
+            //A键移动
+            if (Input.GetKey(KeyCode.A))
+            {
+                Vector3 left = transform.TransformDirection(Vector3.left);
+                ctrlor.Move(left * moveSpeed * Time.deltaTime);
+            }
+            //D键后退
+            if (Input.GetKey(KeyCode.D) && gameObject.transform.position.y > 0)
+            {
+                Vector3 right = transform.TransformDirection(Vector3.right);
+                ctrlor.Move(right * moveSpeed * Time.deltaTime);
+            }
+            //E键升高
+            if (Input.GetKey(KeyCode.Q))
+            {
+                Vector3 upward = transform.TransformDirection(Vector3.up);
+                ctrlor.Move(upward * moveSpeed * Time.deltaTime);
+            }
+            //E键升高
+            if (Input.GetKey(KeyCode.E))
+            {
+                Vector3 down = transform.TransformDirection(Vector3.down);
+                ctrlor.Move(down * moveSpeed * Time.deltaTime);
+            }
+            ////添加相机QE上下移动功能
+            //transform.position+= GetInputTranslationDirection()*0.01f;
 
         }
         if (isRot)

Assets/Scripts/TimeScaleController.cs

@@ -39,12 +39,12 @@ public class TimeScaleController : MonoBehaviour
         }
         if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl))
         {
-            if (Input.GetKeyDown(KeyCode.Q))
+            if (Input.GetKeyDown(KeyCode.C))
             {
                 string str = string.Empty;
                 str = $"{gameObject.transform.position}|{gameObject.transform.eulerAngles}";
 #if UNITY_WEBGL
-                Debug.Log("Ctrl + Q 被按下！");
+                Debug.Log("Ctrl + Q 被按下！"+str);
                 CopyToClipboard(str);
 #elif UNITY_STANDALONE_WIN && !UNITY_EDITOR
                 // ʾÀýÊý¾Ý
@@ -53,18 +53,14 @@ public class TimeScaleController : MonoBehaviour
 #endif
             }
 #if UNITY_STANDALONE_WIN &&!UNITY_EDITOR
-            if (Input.GetKeyDown(KeyCode.E))
+            if (Input.GetKeyDown(KeyCode.V))
             {
                 string tmp = GUIUtility.systemCopyBuffer;
-                Debug.LogError("当前剪贴板：" + tmp);
+                Debug.Log("当前剪贴板：" + tmp);
                 tmp = tmp.Replace("(", "");
-                Debug.LogError(tmp);
                 tmp = tmp.Replace(")", "");
-                Debug.LogError(tmp);
                 var datas = tmp.Split('|');
 
-                Debug.LogError(datas[0]);
-                Debug.LogError(datas[1]);
                 gameObject.transform.position = Utility.GetVector3FromStrArray(datas[0]);
                 gameObject.transform.eulerAngles = Utility.GetVector3FromStrArray(datas[1]);
             }

Assets/Scripts/Tools.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6bb2448096f447040ac74cd700f14893
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Tools/AsposeHelper.cs

@@ -0,0 +1,48 @@
+using Aspose.Words;
+using Aspose.Words.Replacing;
+using QFramework;
+using System.IO;
+using UnityEngine;
+using System.Windows.Forms;
+using Newtonsoft.Json.Linq;
+using System;
+
+public class AsposeHelper : MonoBehaviour
+{
+
+
+    public static void Writer(string json, Action<DialogResult> callback = null)
+    {
+        // 加载Word文档
+        Document doc = new Document(Global.reportDemoPath);
+
+        JObject jObject = JObject.Parse(json);
+
+        foreach (JProperty property in jObject.Properties())
+        {
+            string key = property.Name;
+            string value = property.Value.ToString();
+            doc.Range.Replace($"{{{key}}}", $"{value}", new FindReplaceOptions());
+        }
+        // 替换文本
+        SaveWithDialog(doc, callback);
+        //Debug.Log("文档处理完成，新文档已保存到: " + outputFilePath);
+
+
+
+    }
+
+    private static void SaveWithDialog(Document doc, Action<DialogResult> callback)
+    {
+        SaveFileDialog dialog = new SaveFileDialog();
+        dialog.Filter = "Word文档|*.docx";
+        var result = dialog.ShowDialog();
+        if (result == DialogResult.OK)
+        {
+            doc.Save(dialog.FileName);
+        }
+        callback?.Invoke(result);
+    }
+}
+
+

Assets/Scripts/Tools/AsposeHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f42727d4b91acc4e938a10542fba938
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/UIBody3DMenuTree.cs

@@ -3,7 +3,6 @@ using UnityEngine.UI;
 using XMLTool;
 using System.Collections.Generic;
 using TMPro;
-using UnityEditor.Hardware;
 using DG.Tweening;
 
 namespace QFramework.Example

Assets/Scripts/UI/UICameraSwitch.cs

@@ -21,6 +21,7 @@ namespace QFramework.Example
     }
     public partial class UICameraSwitch : UIPanel
     {
+        bool firstFreeMove = true;
         protected override void OnInit(IUIData uiData = null)
         {
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@@ -114,6 +115,14 @@ namespace QFramework.Example
                 {
                     Near.isOn = false;
                     Far.isOn = false;
+                    if (firstFreeMove)
+                    {
+                        UITipWindowData data = new UITipWindowData();
+                        data.txt = "已切换至自由移动视角，点右下角按钮可回到预制视角。";
+                        data.btns.Add(new UITipWindowData.ItemData() { txt = "确定" });
+                        UIKit.OpenPanelAsync<UITipWindow>(canvasLevel: UILevel.PopUI, uiData: data).ToAction().StartGlobal();
+                        firstFreeMove = false;
+                    }
                 }
             }
 

Assets/Scripts/UI/UIInstruction.Designer.cs

@@ -5,7 +5,7 @@ using QFramework;
 
 namespace QFramework.Example
 {
-	// Generate Id:031f03df-56cd-4f22-b0e4-b4cc8ddb2f1a
+	// Generate Id:f74eb422-cd3e-482e-ab12-950f7715d7bc
 	public partial class UIInstruction
 	{
 		public const string Name = "UIInstruction";
@@ -22,6 +22,8 @@ namespace QFramework.Example
 		public UnityEngine.UI.Image OperationContent;
 		[SerializeField]
 		public UnityEngine.UI.Button ConfirmBtn;
+		[SerializeField]
+		public UnityEngine.UI.Toggle NoToggle;
 		
 		private UIInstructionData mPrivateData = null;
 		
@@ -33,6 +35,7 @@ namespace QFramework.Example
 			ContentText = null;
 			OperationContent = null;
 			ConfirmBtn = null;
+			NoToggle = null;
 			
 			mData = null;
 		}

Assets/Scripts/UI/UIInstruction.cs

@@ -8,9 +8,12 @@ namespace QFramework.Example
 {
     public class UIInstructionData : UIPanelData
     {
+        public bool isRightTop = false;
     }
     public partial class UIInstruction : UIPanel
     {
+        bool isNo = false;
+        bool isOperation = false;
         protected override void OnInit(IUIData uiData = null)
         {
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@@ -42,12 +45,28 @@ namespace QFramework.Example
                 }
                 OperationContent.gameObject.SetActive(isOn);
             });
-            ConfirmBtn.onClick.AddListener(() => Hide());
+            ConfirmBtn.onClick.AddListener(() =>
+            {
+                if (isOperation == false)
+                {
+                    Operation.isOn = true;
+                    isOperation = true;
+                }
+                else
+                {
+                    Hide();
+                    isNo = NoToggle.isOn;
+
+                }
+            });
+
 
         }
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            mData = uiData as UIInstructionData ?? new UIInstructionData();
+
             if (string.IsNullOrEmpty(Global.Instance.curModule.Descript))
             {
 
@@ -57,14 +76,23 @@ namespace QFramework.Example
             {
                 ContentText.text = Global.Instance.curModule.Descript;
             }
+
+            NoToggle.gameObject.SetActive(mData != null && mData.isRightTop == false);
+
         }
 
         protected override void OnShow()
         {
+            if (isNo == true && mData != null && mData.isRightTop == false)
+            {
+                Hide();
+            }
         }
 
         protected override void OnHide()
         {
+            mData = null;
+            StringEventSystem.Global.Send(this.GetType().Name + "Hide");
         }
 
         protected override void OnClose()

Assets/Scripts/UI/UIModuleSelect.cs

@@ -81,14 +81,7 @@ namespace QFramework.Example
         private void OnLoadFinished(Scene arg0, LoadSceneMode arg1)
         {
             SceneManager.sceneLoaded -= OnLoadFinished;
-            if (Global.Instance.curModule.FSM.Count > 0)
+
-            {
-                var machin = StateMachineController.Instance;
-            }
-            if (Global.Instance.curModule.Operations != null && Global.Instance.curModule.Operations.Count > 0)
-            {
-                var op = OperationController.Instance;
-            }
             if (Global.Instance.curModule.Devices != null && Global.Instance.curModule.Devices.Count > 0)
             {
                 var dev = DeviceController.Instance;
@@ -101,6 +94,14 @@ namespace QFramework.Example
             {
                 ScoreController.Instance.Init();
             }
+            if (Global.Instance.curModule.Operations != null && Global.Instance.curModule.Operations.Count > 0)
+            {
+                var op = OperationController.Instance;
+            }
+            if (Global.Instance.curModule.FSM.Count > 0)
+            {
+                var machin = StateMachineController.Instance;
+            }
             UIKit.OpenPanelAsync<UIRightTop>().ToAction().StartGlobal(() =>
             {
 

Assets/Scripts/UI/UIRightTop.cs

@@ -33,7 +33,9 @@ namespace QFramework.Example
         }
         public void OnDesClick()
         {
-            UIKit.OpenPanelAsync<UIInstruction>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+            UIInstructionData data = new UIInstructionData();
+            data.isRightTop = true;
+            UIKit.OpenPanelAsync<UIInstruction>(canvasLevel: UILevel.PopUI, uiData: data).ToAction().StartGlobal();
         }
         public void OnSetClick()
         {

Assets/Scripts/UI/UIScore.cs

@@ -17,32 +17,48 @@ namespace QFramework.Example
             {
                 if (string.IsNullOrEmpty(InputName.text) || string.IsNullOrEmpty(InputId.text))
                 {
-                    Debug.LogError("姓名或者学号为空");
+                    UITipWindowData data = new UITipWindowData();
+                    data.txt = "ÐÕÃû»òÕßѧºÅΪ¿Õ";
+                    data.btns.Add(new UITipWindowData.ItemData() { txt = "È·¶¨" });
+                    UIKit.OpenPanelAsync<UITipWindow>(canvasLevel: UILevel.PopUI, uiData: data).ToAction().Start(this);
                     return;
                 }
 
 
+
+#if UNITY_WEBGL
                 ResLoader loader = ResLoader.Allocate();
                 loader.Add2Load(Global.reportDemoPath.ToLocalBytesResName(), (success, res) =>
                 {
                     if (success)
                     {
                         byte[] bytes = res.As<LocalBytesRes>().bytes;
-                        var data = new LabReprotData();
+                        WebGLDownLoadFile.Instance.DownloadDocx(bytes, GetScoreDataJson());
-                        data.realname = InputName.text;
+
-                        data.biaobencaiji_1_buzhou_1 = "[1111]";
-                        string json = JsonConvert.SerializeObject(data);
-#if UNITY_WEBGL
-                        WebGLDownLoadFile.Instance.DownloadDocx(bytes, json);
-#endif
                     }
                 });
                 loader.LoadAsync();
+#elif UNITY_STANDALONE_WIN
+                DownLoad.interactable = false;
+                AsposeHelper.Writer(GetScoreDataJson(), result =>
+                {
+                    DownLoad.interactable = true;
+                });
+#endif
+
 
             });
             Confirm.onClick.AddListener(Hide);
         }
 
+        public string GetScoreDataJson()
+        {
+            var data = new LabReprotData();
+            data.realname = InputName.text;
+            data.biaobencaiji_1_buzhou_1 = "[1111]";
+            string json = JsonConvert.SerializeObject(data);
+            return json;
+        }
 
 
         protected override void OnOpen(IUIData uiData = null)

Assets/Scripts/UI/UITools.cs

@@ -42,6 +42,7 @@ namespace QFramework.Example
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            mData = uiData as UIToolsData ?? new UIToolsData();
             TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             if (mData.totalScore > 0)
             {

Assets/Scripts/Xml/XmlParser.cs

@@ -265,7 +265,7 @@ namespace XMLTool
                 // 解析模块名称
                 module.type = moduleElement.Element("Type")?.Value;
                 module.ModuleName = moduleElement.Element("Name")?.Value;
-                module.Descript = moduleElement.Element("Descript")?.Value;
+                module.Descript = moduleElement.Element("Descript")?.Value.Trim();
                 module.Scene = moduleElement.Element("Scene")?.Value;
 
                 // 解析设备
@@ -1230,6 +1230,11 @@ namespace XMLTool
                         {
                             act.args.Add("endFrame", endFrame.Value);
                         }
+                        XAttribute speed = action.Attribute("speed");
+                        if (speed != null)
+                        {
+                            act.args.Add("speed", speed.Value);
+                        }
                         newAction = act;
                     }
                     break;