修改内容，UI预制体

Assets/Art/UIPrefab/UIKnowledge.prefab

@@ -272,7 +272,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -37}
-  m_SizeDelta: {x: 1741, y: 730}
+  m_SizeDelta: {x: 1741, y: 904.4126}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1649147629409941582
 CanvasRenderer:
@@ -785,7 +785,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 10
+    m_Left: 50
     m_Right: 10
     m_Top: 10
     m_Bottom: 10
@@ -929,7 +929,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -38.0299, y: -21.9951}
+  m_AnchoredPosition: {x: -46.5, y: -28.4}
   m_SizeDelta: {x: 76.0599, y: 43.9901}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4040266918324163076
@@ -1556,13 +1556,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 22
-  m_fontSizeBase: 20
+  m_fontSizeBase: 22
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
@@ -1809,10 +1809,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 30
-    m_Right: 0
+    m_Right: 10
     m_Top: 0
     m_Bottom: 5
-  m_ChildAlignment: 0
+  m_ChildAlignment: 1
   m_Spacing: 5
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0

Assets/Art/UIPrefab/UIModeSelect.prefab

@@ -805,7 +805,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 273, y: -49}
+  m_AnchoredPosition: {x: 352, y: -104}
   m_SizeDelta: {x: 546, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1007982851582153361

Assets/Art/UIPrefab/UIModuleSelect.prefab

@@ -1760,8 +1760,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4278190080
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Art/UIPrefab/UIRightTop.prefab

@@ -1182,8 +1182,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4278190080
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Projects/AnHuiSheYing/Models/SheYingJi/New Scene.unity

@@ -0,0 +1,317 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &1697111982
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1697111985}
+  - component: {fileID: 1697111984}
+  - component: {fileID: 1697111983}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1697111983
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697111982}
+  m_Enabled: 1
+--- !u!20 &1697111984
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697111982}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1697111985
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1697111982}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  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}
+--- !u!1 &1733772055
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1733772057}
+  - component: {fileID: 1733772056}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1733772056
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1733772055}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &1733772057
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1733772055}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1697111985}
+  - {fileID: 1733772057}

Assets/Projects/AnHuiSheYing/Models/SheYingJi/New Scene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 75235b901ca24334cb3238a00c3312bc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/QFrameworkData/QAssets.cs

@@ -16,11 +16,56 @@ namespace QAssetBundle
         public const string BundleName = "line_prefab";
         public const string LINE = "Line";
     }
+    public class Pingfang_medium_sdf_asset
+    {
+        public const string BundleName = "pingfang medium sdf_asset";
+        public const string PINGFANG_MEDIUM_SDF = "PingFang Medium SDF";
+    }
+    public class Pingfangscmedium_sdf_asset
+    {
+        public const string BundleName = "pingfangsc-medium sdf_asset";
+        public const string PINGFANGSCMEDIUM_SDF = "PingFangSC-Medium SDF";
+    }
     public class Title_quan_png
     {
         public const string BundleName = "title_quan_png";
         public const string TITLE = "Title";
     }
+    public class Ui3dbodyinfo_prefab
+    {
+        public const string BundleName = "ui3dbodyinfo_prefab";
+        public const string UIBODY3DINFO = "UIBody3DInfo";
+    }
+    public class Ui3dobjselect_prefab
+    {
+        public const string BundleName = "ui3dobjselect_prefab";
+        public const string UI3DOBJSELECT = "UI3DObjSelect";
+    }
+    public class Ui3dobjshow_prefab
+    {
+        public const string BundleName = "ui3dobjshow_prefab";
+        public const string UI3DOBJSHOW = "UI3DObjShow";
+    }
+    public class Uibackpack_prefab
+    {
+        public const string BundleName = "uibackpack_prefab";
+        public const string UIBACKPACK = "UIBackPack";
+    }
+    public class Uibody3d_prefab
+    {
+        public const string BundleName = "uibody3d_prefab";
+        public const string UIBODY3D = "UIBody3D";
+    }
+    public class Uibody3dmenutree_prefab
+    {
+        public const string BundleName = "uibody3dmenutree_prefab";
+        public const string UIBODY3DMENUTREE = "UIBody3DMenuTree";
+    }
+    public class Uibody3dmouse_prefab
+    {
+        public const string BundleName = "uibody3dmouse_prefab";
+        public const string UIBODY3DMOUSE = "UIBody3DMouse";
+    }
     public class Uibtns_prefab
     {
         public const string BundleName = "uibtns_prefab";
@@ -31,21 +76,51 @@ namespace QAssetBundle
         public const string BundleName = "uicameraswitch_prefab";
         public const string UICAMERASWITCH = "UICameraSwitch";
     }
+    public class Uichangeoperation_prefab
+    {
+        public const string BundleName = "uichangeoperation_prefab";
+        public const string UICHANGEOPERATION = "UIChangeOperation";
+    }
     public class Uidevicetip_prefab
     {
         public const string BundleName = "uidevicetip_prefab";
         public const string UIDEVICETIP = "UIDeviceTip";
     }
+    public class Uidraw_prefab
+    {
+        public const string BundleName = "uidraw_prefab";
+        public const string UIDRAW = "UIDraw";
+    }
     public class Uihint_prefab
     {
         public const string BundleName = "uihint_prefab";
         public const string UIHINT = "UIHint";
     }
+    public class Uiimageselectmap_prefab
+    {
+        public const string BundleName = "uiimageselectmap_prefab";
+        public const string UIIMAGESELECTMAP = "UIImageSelectMap";
+    }
+    public class Uiimagetip_prefab
+    {
+        public const string BundleName = "uiimagetip_prefab";
+        public const string UIIMAGETIP = "UIImageTip";
+    }
+    public class Uiinput_prefab
+    {
+        public const string BundleName = "uiinput_prefab";
+        public const string UIINPUT = "UIInput";
+    }
     public class Uiinstruction_prefab
     {
         public const string BundleName = "uiinstruction_prefab";
         public const string UIINSTRUCTION = "UIInstruction";
     }
+    public class Uiknowledge_prefab
+    {
+        public const string BundleName = "uiknowledge_prefab";
+        public const string UIKNOWLEDGE = "UIKnowledge";
+    }
     public class Uiloading_prefab
     {
         public const string BundleName = "uiloading_prefab";
@@ -66,11 +141,6 @@ namespace QAssetBundle
         public const string BundleName = "uimoduleselect_prefab";
         public const string UIMODULESELECT = "UIModuleSelect";
     }
-    public class Uioperation_prefab
-    {
-        public const string BundleName = "uioperation_prefab";
-        public const string UIOPERATION = "UIOperation";
-    }
     public class Uioperationlist_prefab
     {
         public const string BundleName = "uioperationlist_prefab";
@@ -111,6 +181,16 @@ namespace QAssetBundle
         public const string BundleName = "uitexttip_prefab";
         public const string UITEXTTIP = "UITextTip";
     }
+    public class Uitextwindow_prefab
+    {
+        public const string BundleName = "uitextwindow_prefab";
+        public const string UITEXTWINDOW = "UITextWindow";
+    }
+    public class Uitimetip_prefab
+    {
+        public const string BundleName = "uitimetip_prefab";
+        public const string UITIMETIP = "UITimeTip";
+    }
     public class Uitipwindow_prefab
     {
         public const string BundleName = "uitipwindow_prefab";

Assets/Scripts/UILongPicture/UIKnowledge.cs

@@ -25,7 +25,12 @@ namespace QFramework.Example
             loader = ResLoader.Allocate();
             CloseBtn.onClick.AddListener(() =>
             {
+                //Hide();
                 Hide();
+                TypeEventSystem.Global.Send<OnModuleQuit>();
+                UIKit.ClosePanel<UIRightTop>();
+                UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal();
+
             });
         }
 

Data/Xml/02_SheYingQiCaiRenZhi.xml

@@ -31,7 +31,6 @@
           <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>
 
 
-          <Action type="StrEvent" name="Main/SM_Sanjiaojia" value="true"></Action>
      
 
 

Data/Xml/03_ChangJingXuNiPaiShe.xml

@@ -22,6 +22,9 @@
           <Action type="UIShow" value="UIOperationList" isShow="true"></Action>
           <Action type="UIShow" value="UIChangeOperation" isShow="true"></Action>
 
+          <Action type="Show" value="Canvas/ShuBiaoTiShi" isShow="true" ></Action>
+
+
 
 
 
@@ -170,6 +173,21 @@
           <Action type="OperationChange" name="初始化"></Action>
         </Action>
       </Enter>
+
+      <Exit>
+        <Action type="Sequence">
+
+
+          <Action type="Show" value="Canvas/ShuBiaoTiShi" isShow="false" ></Action>
+
+
+
+
+        </Action>
+
+
+
+      </Exit>
     </State>
 
 
@@ -290,7 +308,6 @@
         <!--<Action type="Hint" value="选择对应模块，进行对应实验。" time="-1" icon="false"></Action>-->
         <Action type="UIShow" value="Hint" isShow="true"></Action>
         <Action type="Hint" value="选择对应模块，进行对应实验。" time="-1" icon="false"></Action>
-
         <!--<Action type="NextOperation"></Action>-->
       </Step>
     </Step>