修改内容

Assets/Art/UIPrefab/DaTiUI.prefab

@@ -11364,7 +11364,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -728.42084, y: 442.11462}
+  m_AnchoredPosition: {x: -728.42084, y: 363.1146}
   m_SizeDelta: {x: 315.1583, y: 42.2292}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1904365336969703734
@@ -13205,7 +13205,7 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: -79}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4798623974119905460
@@ -15845,7 +15845,6 @@ GameObject:
   m_Component:
   - component: {fileID: 784951025117732513}
   - component: {fileID: 7120663045569870871}
-  - component: {fileID: 836805869239772357}
   m_Layer: 5
   m_Name: BG
   m_TagString: Untagged
@@ -15884,36 +15883,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6654797879820880678}
   m_CullTransparentMesh: 1
---- !u!114 &836805869239772357
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6654797879820880678}
-  m_Enabled: 0
-  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: 54b65828ace50bd41a44c0e7de315db4, 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 &6663519883710659704
 GameObject:
   m_ObjectHideFlags: 0
@@ -18439,7 +18408,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: 406, y: -132.9}
+  m_AnchoredPosition: {x: 1265.2, y: 712}
   m_SizeDelta: {x: 788, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2676440700355112391
@@ -19634,7 +19603,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 293, y: -243}
+  m_AnchoredPosition: {x: 293, y: -322}
   m_SizeDelta: {x: 117.1042, y: 49.7178}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &224602193607177363
@@ -20446,7 +20415,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 293, y: -243}
+  m_AnchoredPosition: {x: 293, y: -322}
   m_SizeDelta: {x: 117.1042, y: 49.7178}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3295312194154277376

Assets/Art/UIPrefab/UIImageSelectMap_JiHe.prefab

@@ -12,6 +12,8 @@ GameObject:
   - component: {fileID: 5592331253240679270}
   - component: {fileID: 4673699357841643462}
   - component: {fileID: 2993659944740356471}
+  - component: {fileID: 400116976828751835}
+  - component: {fileID: 8070352767613450681}
   m_Layer: 0
   m_Name: Frame
   m_TagString: Untagged
@@ -92,7 +94,51 @@ MonoBehaviour:
   CustomComponentName: Frame
   CustomComment: 
   mComponentName: UnityEngine.UI.Image
---- !u!1 &1309791202588305067
+--- !u!114 &400116976828751835
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 644795799390167321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &8070352767613450681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 644795799390167321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 50
+    m_Right: 50
+    m_Top: 50
+    m_Bottom: 20
+  m_ChildAlignment: 1
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 250, y: 250}
+  m_Spacing: {x: 100, y: 10}
+  m_Constraint: 0
+  m_ConstraintCount: 2
+--- !u!1 &787573358939743505
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -100,149 +146,77 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3205622361118372873}
+  - component: {fileID: 6143799320277397671}
-  - component: {fileID: 6797863549562501630}
+  - component: {fileID: 4814649280823604709}
-  - component: {fileID: 9101307916523755176}
+  - component: {fileID: 5286357218102843109}
-  - component: {fileID: 2522080552618198833}
   m_Layer: 0
-  m_Name: Name
+  m_Name: Text (Legacy)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3205622361118372873
+--- !u!224 &6143799320277397671
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1309791202588305067}
+  m_GameObject: {fileID: 787573358939743505}
   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: 3240550787534871379}
+  m_Father: {fileID: 863815765030289893}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -1.1024, y: -160}
+  m_AnchoredPosition: {x: 0, y: -15.2}
-  m_SizeDelta: {x: 94.6757, y: 27.7639}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6797863549562501630
+--- !u!222 &4814649280823604709
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1309791202588305067}
+  m_GameObject: {fileID: 787573358939743505}
   m_CullTransparentMesh: 1
---- !u!114 &9101307916523755176
+--- !u!114 &5286357218102843109
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1309791202588305067}
+  m_GameObject: {fileID: 787573358939743505}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u65CB\u8F6C\u4F53"
+  m_FontData:
-  m_isRightToLeft: 0
+    m_Font: {fileID: 12800000, guid: ed2dcf76fce32514fbf37799df2d4136, type: 3}
-  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+    m_FontSize: 25
-  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+    m_FontStyle: 0
-  m_fontSharedMaterials: []
+    m_BestFit: 0
-  m_fontMaterial: {fileID: 0}
+    m_MinSize: 1
-  m_fontMaterials: []
+    m_MaxSize: 40
-  m_fontColor32:
+    m_Alignment: 4
-    serializedVersion: 2
+    m_AlignByGeometry: 0
-    rgba: 4294967295
+    m_RichText: 1
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HorizontalOverflow: 0
-  m_enableVertexGradient: 0
+    m_VerticalOverflow: 0
-  m_colorMode: 3
+    m_LineSpacing: 1
-  m_fontColorGradient:
+  m_Text: New Text
-    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: 20
-  m_fontSizeBase: 20
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 4096
-  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!114 &2522080552618198833
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1309791202588305067}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  MarkType: 0
-  CustomComponentName: Name
-  CustomComment: 
-  mComponentName: TMPro.TextMeshProUGUI
 --- !u!1 &1534166527897496407
 GameObject:
   m_ObjectHideFlags: 0
@@ -483,6 +457,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5065642014798611877}
+  - {fileID: 863815765030289893}
   m_Father: {fileID: 3838833872239473580}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -617,6 +592,8 @@ GameObject:
   - component: {fileID: 6928961726854385399}
   - component: {fileID: 8213053143336876725}
   - component: {fileID: 2133693838852885263}
+  - component: {fileID: 5531252535131482906}
+  - component: {fileID: 3570309642526301901}
   m_Layer: 0
   m_Name: Frame
   m_TagString: Untagged
@@ -697,6 +674,50 @@ MonoBehaviour:
   CustomComponentName: Frame
   CustomComment: 
   mComponentName: UnityEngine.UI.Image
+--- !u!114 &5531252535131482906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3420336141262646870}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &3570309642526301901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3420336141262646870}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 180
+    m_Right: 50
+    m_Top: 50
+    m_Bottom: 20
+  m_ChildAlignment: 1
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 250, y: 250}
+  m_Spacing: {x: 80, y: 10}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!1 &3581311008806056906
 GameObject:
   m_ObjectHideFlags: 0
@@ -810,8 +831,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 337, y: 694}
+  m_AnchoredPosition: {x: 337, y: 616.362}
-  m_SizeDelta: {x: 600, y: 500}
+  m_SizeDelta: {x: 600, y: 655.276}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2989934290346154672
 CanvasRenderer:
@@ -881,6 +902,115 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3891607971985309342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 863815765030289893}
+  - component: {fileID: 3034317932466633734}
+  - component: {fileID: 2939607359603865028}
+  - component: {fileID: 7681387657801445753}
+  - component: {fileID: 8162314312916432806}
+  m_Layer: 0
+  m_Name: LeftItem (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &863815765030289893
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891607971985309342}
+  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: 6143799320277397671}
+  m_Father: {fileID: 8333043509333940129}
+  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: 300, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3034317932466633734
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891607971985309342}
+  m_CullTransparentMesh: 1
+--- !u!114 &2939607359603865028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891607971985309342}
+  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: 0}
+  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!114 &7681387657801445753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891607971985309342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: LeftItem
+  CustomComment: 
+  mComponentName: UnityEngine.UI.Image
+--- !u!114 &8162314312916432806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891607971985309342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55cd654f93809b34da0cf6fefd602a8b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 0}
+  targetObjName: 
+  originPos: {x: 0, y: 0, z: 0}
 --- !u!1 &4024388799813096854
 GameObject:
   m_ObjectHideFlags: 0
@@ -988,6 +1118,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   target: {fileID: 0}
+  targetObjName: 
   originPos: {x: 0, y: 0, z: 0}
 --- !u!1 &4138736096266597115
 GameObject:
@@ -1074,6 +1205,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6336473892143704609}
   - component: {fileID: 1467124759781623263}
+  - component: {fileID: 6463911164894843504}
   m_Layer: 0
   m_Name: LeftContent
   m_TagString: Untagged
@@ -1088,7 +1220,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4335887278641882288}
-  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_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1097,9 +1229,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.00005665457}
+  m_AnchoredPosition: {x: 0, y: -327.6378}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 634.5404}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1467124759781623263
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1116,6 +1248,30 @@ MonoBehaviour:
   CustomComponentName: Content
   CustomComment: 
   mComponentName: RectTransform
+--- !u!114 &6463911164894843504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4335887278641882288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 25
+    m_Right: 25
+    m_Top: 30
+    m_Bottom: 30
+  m_ChildAlignment: 1
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 120, y: 110}
+  m_Spacing: {x: 60, y: 50}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!1 &4900020430220917441
 GameObject:
   m_ObjectHideFlags: 0
@@ -1337,7 +1493,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 788.717, y: 285.9637}
+  m_SizeDelta: {x: 1182, y: 370.1782}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3044915735821904349
 CanvasRenderer:
@@ -1752,13 +1908,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5710883606592194882}
-  - {fileID: 3205622361118372873}
+  - {fileID: 3209694615349308258}
   m_Father: {fileID: 6690386520824484871}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 788.717, y: 285.9637}
+  m_SizeDelta: {x: 1182, y: 401.0439}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5011064671592862783
 CanvasRenderer:
@@ -1948,7 +2104,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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
@@ -2081,8 +2237,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -92.41113, y: -56.46762}
+  m_AnchoredPosition: {x: -92.41113, y: -69.63455}
-  m_SizeDelta: {x: 135.178, y: 98.4936}
+  m_SizeDelta: {x: 135.178, y: 72.1597}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &764076292870188880
 CanvasRenderer:
@@ -2112,7 +2268,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: f6ab03e1e3abedf4f914a117a25a5aa0, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2315,7 +2471,7 @@ MonoBehaviour:
     m_Top: 10
     m_Bottom: 10
   m_ChildAlignment: 0
-  m_Spacing: 30
+  m_Spacing: 31
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -2335,6 +2491,7 @@ GameObject:
   - component: {fileID: 8468731777364273816}
   - component: {fileID: 3128431688294455599}
   - component: {fileID: 6794827447402658347}
+  - component: {fileID: 8771131989355196117}
   m_Layer: 0
   m_Name: Name
   m_TagString: Untagged
@@ -2356,10 +2513,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7304815477281814644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -1.1024, y: -160}
+  m_AnchoredPosition: {x: -491, y: 0}
-  m_SizeDelta: {x: 94.6757, y: 27.7639}
+  m_SizeDelta: {x: -1087.5819, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8468731777364273816
 CanvasRenderer:
@@ -2398,8 +2555,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4293848814
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -2416,15 +2573,15 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 70
-  m_fontSizeBase: 20
+  m_fontSizeBase: 70
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 4096
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -2474,6 +2631,26 @@ MonoBehaviour:
   CustomComponentName: Name
   CustomComment: 
   mComponentName: TMPro.TextMeshProUGUI
+--- !u!114 &8771131989355196117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7838140580968973888}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &8228266746100192071
 GameObject:
   m_ObjectHideFlags: 0
@@ -2796,3 +2973,175 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &8983658835488918910
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3209694615349308258}
+  - component: {fileID: 2820316481755220290}
+  - component: {fileID: 3804490017368593475}
+  - component: {fileID: 4461869660241643830}
+  - component: {fileID: 3660685939532853281}
+  m_Layer: 0
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3209694615349308258
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983658835488918910}
+  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: 3240550787534871379}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -491, y: 2}
+  m_SizeDelta: {x: -1087.5819, y: -30.865723}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2820316481755220290
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983658835488918910}
+  m_CullTransparentMesh: 1
+--- !u!114 &3804490017368593475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983658835488918910}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u65CB\u8F6C\u4F53"
+  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: 4293848814
+  m_fontColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, 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: 70
+  m_fontSizeBase: 70
+  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!114 &4461869660241643830
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983658835488918910}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: Name
+  CustomComment: 
+  mComponentName: TMPro.TextMeshProUGUI
+--- !u!114 &3660685939532853281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983658835488918910}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1

Assets/Art/UIPrefab/UIVideo.prefab

@@ -447,7 +447,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3356970918032840058}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -1332,7 +1332,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8310881313339612482}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 

Assets/Projects/新疆双河职业技术学院/A_SM_LengZhui.fbx.meta

@@ -8,7 +8,7 @@ ModelImporter:
       type: UnityEngine:Material
       assembly: UnityEngine.CoreModule
       name: M_LengZhui
-    second: {fileID: 2100000, guid: e3785b298a004274798d887921c64678, type: 2}
+    second: {fileID: 2100000, guid: 3b9b715687bc9b848a25f7dfc5231ba7, type: 2}
   materials:
     materialImportMode: 2
     materialName: 0

Assets/Projects/新疆双河职业技术学院/Materials/M_LengZhu.mat

@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &-7824636721728067652
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -24,19 +11,15 @@ Material:
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
+  m_ValidKeywords: []
-  - _ALPHAPREMULTIPLY_ON
-  - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
   stringTagMap:
-    RenderType: Transparent
+    RenderType: Opaque
-  disabledShaderPasses:
+  disabledShaderPasses: []
-  - DepthOnly
-  - SHADOWCASTER
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -110,30 +93,43 @@ Material:
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
-    - _DstBlend: 10
+    - _DstBlend: 0
-    - _DstBlendAlpha: 10
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.2
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0
+    - _Smoothness: 0.3
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SrcBlendAlpha: 1
-    - _Surface: 1
+    - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _ZWrite: 0
+    - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6792453, g: 0.6792453, b: 0.6792453, a: 1}
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
-    - _Color: {r: 0.6792453, g: 0.6792453, b: 0.6792453, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &7831097374513739653
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

Assets/Projects/新疆双河职业技术学院/Materials/M_LengZhui.mat

@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: M_LengZhui
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0.2
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.3
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &8793215510469214049
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

Assets/Projects/新疆双河职业技术学院/Materials/M_LengZhui.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3b9b715687bc9b848a25f7dfc5231ba7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Projects/新疆双河职业技术学院/Materials/M_QiuTi_Hong.mat

@@ -105,7 +105,7 @@ Material:
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.55
+    - _Smoothness: 0.3
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -115,8 +115,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
-    - _Color: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Materials/M_QiuTi_Lan.mat

@@ -118,7 +118,7 @@ Material:
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.55
+    - _Smoothness: 0.3
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -128,8 +128,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
-    - _Color: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Materials/lambert1.mat

@@ -15,7 +15,7 @@ Material:
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
+  m_DoubleSidedGI: 1
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: Opaque
@@ -89,7 +89,7 @@ Material:
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
@@ -113,8 +113,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Materials/lambert2.mat

@@ -28,7 +28,7 @@ Material:
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
+  m_DoubleSidedGI: 1
   m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: Opaque
@@ -102,7 +102,7 @@ Material:
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
@@ -118,7 +118,7 @@ Material:
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.55
+    - _Smoothness: 0.3
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -128,8 +128,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _BaseColor: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
-    - _Color: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _Color: {r: 0.95686275, g: 0.75686276, b: 0.41960785, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Materials/lambert3.mat

@@ -29,7 +29,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
@@ -118,7 +118,7 @@ Material:
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.55
+    - _Smoothness: 0.3
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -128,8 +128,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _BaseColor: {r: 0.9568628, g: 0.7568628, b: 0.41960788, a: 1}
-    - _Color: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _Color: {r: 0.9568628, g: 0.7568628, b: 0.41960788, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Materials/lambertzza.mat

@@ -128,8 +128,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _BaseColor: {r: 0.9568628, g: 0.7568628, b: 0.41960788, a: 1}
-    - _Color: {r: 0.6784314, g: 0.6784314, b: 0.6784314, a: 1}
+    - _Color: {r: 0.9568628, g: 0.7568628, b: 0.41960788, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Projects/新疆双河职业技术学院/Model/6.30/20250630(1)/Materials/YuanZhu.mat

@@ -135,8 +135,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Scripts/Actions/SliderAnimAction.cs

@@ -72,8 +72,9 @@ namespace QFramework
 
             data.title = datas.ContainsKey("title") ? datas["title"] : string.Empty;
             data.targetObj = datas.ContainsKey("targetObj") ? datas["targetObj"] : string.Empty;
+            data.HideObject = datas.ContainsKey("HideObject") ? datas["HideObject"] : string.Empty;
+
 
-          
             UIKit.OpenPanelAsync<UISliderAnim>(uiData: data, canvasLevel: UILevel.Common).ToAction().StartGlobal(() =>
             {
                 this.Finish();

Assets/Scripts/Controller/VarController.cs

@@ -60,8 +60,16 @@ public class VarController : MonoSingleton<VarController>
 
 
 
+    [ContextMenu("输出一遍控制变量")]
+    public void DebugVarController()
+    {
+        foreach (var item in varDict)
+        {
 
-
+            Debug.Log(item.Key+ "!!!"+item.Value+"???");
+            
+        }
+    }
 
 
 

Assets/Scripts/UI/UIImageSelectMap_JiHe/UIImageDrag_JiHe.cs

@@ -13,6 +13,8 @@ public class UIImageDrag_JiHe : MonoBehaviour, IBeginDragHandler, IDragHandler,
 
     List<RaycastResult> raycastResults;
     public GameObject target;
+ //public   string targetObjName = uiPanel.Data.TargetObj;
+    public string targetObjName;
     public Vector3 originPos;
     bool isOverTarget = false; // 是否在目标物体上结束拖拽
     bool isRight = false; // 是否放置正确
@@ -61,7 +63,7 @@ public class UIImageDrag_JiHe : MonoBehaviour, IBeginDragHandler, IDragHandler,
             return;
         }
 
-        string targetObjName = uiPanel.Data.TargetObj;
+
 
         raycastResults.Clear();
         EventSystem.current.RaycastAll(eventData, raycastResults);
@@ -109,6 +111,10 @@ public class UIImageDrag_JiHe : MonoBehaviour, IBeginDragHandler, IDragHandler,
         else
         {
             rect.anchoredPosition = originPos;
+            LayoutRebuilder.ForceRebuildLayoutImmediate(rect.transform.parent.GetComponent<RectTransform>());
+            
+
+          
         }
 
         isOverTarget = false;

Assets/Scripts/UI/UIImageSelectMap_JiHe/UIImageSelectMap_JiHe.cs

@@ -39,26 +39,38 @@ namespace QFramework.Example
             Frame2.GetComponent<Image>().color = Color.white;
             //   Destory(Kuang1.gameObject.GetComponentInChildren<UIImageDrag_JiHe>());
 
-            string s = mData.DragItemName;
-
-            // Éú³Éµ¥¸öÎïÌå
-            GameObject obj = GameObject.Instantiate(LeftItem, LeftContent.transform);
-            obj.name = s;
-
-
         
-            string path = Global.deviceIconsPath + mData.ItemPath;
-     
-            loader.Add2Load(path.ToNetImageResName(), (success, res) =>
-            {
-                if (success)
-                {
-                    obj.GetComponent<Image>().sprite = Utility.GetSprite(res.Asset as Texture2D);
-                    obj.GetComponentInChildren<Text>().text = s;
-                }
-            });
 
-            uIImageDrag_JiHe = obj.GetComponent<UIImageDrag_JiHe>();
+         string[] Items=mData.DragItemName.Split("|");
+            string[] Targets = mData.TargetObj.Split("|");
+            string[] ItemPaths = mData.ItemPath.Split("|");
+            for (int i = 0; i < Items.Length; i++)
+            {
+
+                int v = i;
+                GameObject obj = GameObject.Instantiate(LeftItem, LeftContent.transform);
+                obj.name = Items[v];
+                string path = Global.deviceIconsPath + ItemPaths[v];
+                uIImageDrag_JiHe = obj.GetComponent<UIImageDrag_JiHe>();
+                uIImageDrag_JiHe.targetObjName = Targets[v];
+                loader.Add2Load(path.ToNetImageResName(), (success, res) =>
+                {
+                    if (success)
+                    {
+                        obj.GetComponent<Image>().sprite = Utility.GetSprite(res.Asset as Texture2D);
+                        obj.GetComponentInChildren<Text>().text = Items[v];
+                    }
+                });
+             
+            }
+
+
+
+
+
+
+
+            //obj.GetComponent<UIImageDrag_JiHe>().targetObjName=
 
 
             CloseBtn.onClick.RemoveAllListeners();

Assets/Scripts/UI/UISliderAnim/UISliderAnim.cs

@@ -10,8 +10,9 @@ namespace QFramework.Example
 	public class UISliderAnimData : UIPanelData
 	{
 		public string title;
-		public string targetObj;
+		public string targetObj; 
-		
+        public string HideObject;
+
     }
 	public partial class UISliderAnim : UIPanel
 	{
@@ -25,7 +26,7 @@ namespace QFramework.Example
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
 
         }
-
+        Transform[] childsTransforms;
         protected override void OnOpen(IUIData uiData = null)
         {
 
@@ -45,6 +46,14 @@ namespace QFramework.Example
                 // ²éÕÒÄ¿±ê¶ÔÏó²¢»ñÈ¡SkinnedMeshRenderer
                 GameObject obj = Utility.FindObj(mData.targetObj.ToString());
                 SkinnedMeshRenderer skinnedRenderer = obj.GetComponent<SkinnedMeshRenderer>();
+               
+                //childsTransforms = transform.GetComponentsInChildren<Transform>(true);
+                //foreach (var objChild in childsTransforms) {
+                //    objChild.gameObject.SetActive(false);
+
+                //}
+
+
 
                 if (skinnedRenderer != null)
                 {
@@ -123,11 +132,23 @@ namespace QFramework.Example
                 if (slider.value != 0)
                 {
                     UIKit.GetPanel<UIGuideTip>()?.Hide();
+                    GameObject obj = Utility.FindObj(mData.HideObject.ToString());
+                    obj.gameObject.SetActive(false);
                     break;
                 }
                 else if(slider.value == 0)
                 {
-                   var v= UIKit.GetPanel<UIGuideTip>();
+                    //foreach (var objChild in childsTransforms)
+                    //{
+                    //    objChild.gameObject.SetActive(true);
+
+                    //}
+                    GameObject obj = Utility.FindObj(mData.HideObject.ToString());
+                    obj.gameObject.SetActive(true);
+                    
+
+
+                    var v= UIKit.GetPanel<UIGuideTip>();
                     var Data = UIKit.GetPanel<UIGuideTip>().Data;
                     UIKit.OpenPanelAsync<UIGuideTip>(uiData: Data, canvasLevel: UILevel.Common).ToAction().StartGlobal(() =>
                     {

Assets/Scripts/Xml/XmlParser.cs

@@ -1997,6 +1997,11 @@ namespace XMLTool
                         {
                             act.args.Add("targetObj", targetObj.Value);
                         }
+                        XAttribute HideObject = action.Attribute("HideObject");
+                        if (HideObject != null)
+                        {
+                            act.args.Add("HideObject", HideObject.Value);
+                        }
                         newAction = act;
 
                     }

Data/Xml/01_JiaoXue.xml

@@ -7,13 +7,13 @@
 
 
 
-<Descript>
+  <Descript>
-  1.掌握柱、锥、球及其组合体的结构特征与分类；
+    1.掌握柱、锥、球及其组合体的结构特征与分类；
-  2.熟练运用几何体的表面积、体积公式；
+    2.熟练运用几何体的表面积、体积公式；
-  3.提升空间想象能力与三维构造分析能力。
+    3.提升空间想象能力与三维构造分析能力。
-</Descript>
+  </Descript>
-  
+
-  
+
   <Device>
     <Name>棱柱</Name>
     <!--<HighLight color="255,0,0,255"/>-->
@@ -70,7 +70,12 @@
 
           <Action type="Hint" value="请选择对应模块，进行对应实验学习。或者使用键盘鼠标，自由漫游场景，进行游览。" time="-1" icon="false"></Action>
 
-
+          <Action type="Var" name="进入棱柱" value="0"></Action>
+          <Action type="Var" name="进入棱锥" value="0"></Action>
+          <Action type="Var" name="进入球体" value="0"></Action>
+          <Action type="Var" name="进入圆柱" value="0"></Action>
+          <Action type="Var" name="进入圆锥" value="0"></Action>
+    
 
           <Action type="TextTip" audio="" title="教学目标" value="1.掌握柱、锥、球及其组合体的结构特征与分类；
 \n2.熟练运用几何体的表面积、体积公式；
@@ -78,7 +83,11 @@
 
           <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 
-          <Action type="Greatbtns"  name="动态三维建模|分类对比学习|分类对比学习|分类对比学习|分类对比学习|分类对比学习|棱柱形成动画|棱锥形成动画|球体形成动画|圆柱形成动画|圆锥形成动画"   HieraName="动态三维建模|棱柱分类对比学习|棱锥分类对比学习|球体分类对比学习|圆柱分类对比学习|圆锥分类对比学习|棱柱形成动画|棱锥形成动画|球体形成动画|圆柱形成动画|圆锥形成动画"  pos="-889,317.1|-756,317.1|-756,317.1|-756,317.1|-756,317.1|-756,317.1|730,347|730,347|730,347|730,347|730,347"  size="125,70|125,70|125,70|125,70|125,70|125,70|125,70|125,70|125,70|125,70|125,70" />
+          <Action type="Greatbtns"
+                  name="动态三维建模|分类对比学习|棱柱形成动画|棱锥形成动画|球体形成动画|圆柱形成动画|圆锥形成动画"
+                  HieraName="动态三维建模|分类对比学习|棱柱形成动画|棱锥形成动画|球体形成动画|圆柱形成动画|圆锥形成动画"
+                  pos="-889,317.1|-756,317.1|730,347|730,347|730,347|730,347|730,347"
+                  size="125,70|125,70|125,70|125,70|125,70|125,70|125,70" />
 
 
 
@@ -92,21 +101,18 @@
 
           <Action type="Show" value="Main/A_SM_LengZhu"  isShow="true" isDevice="false"></Action>
 
-          
+
           <!--隐藏所有的UIBtn，分类识别-->
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱分类对比学习"  isShow="false" isDevice="false"></Action>
+          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/分类对比学习"  isShow="true" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥分类对比学习"  isShow="false" isDevice="false"></Action>
+
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体分类对比学习"  isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱分类对比学习"  isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥分类对比学习"  isShow="false" isDevice="false"></Action>
 
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱形成动画"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥形成动画"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体形成动画"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱形成动画"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥形成动画"  isShow="false" isDevice="false"></Action>
-          
+
-          
+
           <Action type="Var" name="进入棱柱" value="1"></Action>
 
 
@@ -136,7 +142,7 @@
 
     </State>
 
-    <!--状态-->
+    <!--状态机-->
     <State name="棱柱">
       <Enter>
         <Action type="Sequence">
@@ -144,29 +150,34 @@
 
           <Action type="Log" value="进入棱柱状态机"></Action>
 
-          
 
-          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="-188" y="43" Distance="8"></Action>
+         
-          
+          <Action type="Var" name="进入棱锥" value="0"></Action>
+          <Action type="Var" name="进入球体" value="0"></Action>
+          <Action type="Var" name="进入圆柱" value="0"></Action>
+          <Action type="Var" name="进入圆锥" value="0"></Action>
           
+          <Action type="Var" name="进入棱柱" value="2"></Action>
+
+
+
+          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="-148" y="29" Distance="5"></Action>
+
+
           <Action type="Show" value="Main/A_SM_LengZhu"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱形成动画"  isShow="true" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱分类对比学习"  isShow="true" isDevice="false"></Action>
+        
 
-       
 
-    
           <Action type="UIBackPack" devices="棱柱,棱锥,球体,圆柱,圆锥"
                             random="false"
                             scrollSpeed="25" position="left"
               ></Action>
 
-      
-       <Action type="Var" name="进入棱柱" value="2"></Action>
 
           <Action type="UIGuideTip"
              targetName="棱柱上底面,棱柱上底面边长,棱柱底面,棱柱底面边长,棱柱侧面,侧棱,棱柱棱高,棱柱顶点"
-             offSet="200,0,0|0,100,0|-200,0,0|-250,0,0|-250,0,0|300,0,0|447,0,0|-300,0,0"
+             offSet="200,0,0|-100,100,0|-200,0,0|-400,0,0|-250,0,0|300,0,0|447,0,0|-300,0,0"
              showName="棱柱上底面,棱柱上底面边长,棱柱底面,棱柱底面边长,棱柱侧面,侧棱,棱柱棱高,棱柱顶点"
              tiptext="
                   互相平行的两个面叫作棱柱的底面，位于棱柱上面，叫上底面。|
@@ -191,7 +202,7 @@
                   
                   ></Action>
 
-          <Action type="UISliderAnim"  title="棱柱倾斜度|底面边长|上底面边长|棱高" targetObj="Main/A_SM_LengZhu">  </Action>
+          <Action type="UISliderAnim"  HideObject="Main/A_SM_LengZhu/SM_LengZhuXianKuang" title="棱柱倾斜度|底面边长|上底面边长|棱高" targetObj="Main/A_SM_LengZhu">  </Action>
 
 
 
@@ -199,8 +210,10 @@
       </Enter>
       <Exit>
         <Action type="Sequence">
+
+
           <Action type="Show" value="Main/A_SM_LengZhu"  isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱分类对比学习"  isShow="false" isDevice="false"></Action>
+          
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱形成动画"  isShow="false" isDevice="false"></Action>
         </Action>
       </Exit>
@@ -214,15 +227,24 @@
         <Action type="Sequence">
 
           <Action type="Log" value="棱锥"></Action>
+
+
+          <Action type="Var" name="进入棱柱" value="0"></Action>
+          <Action type="Var" name="进入球体" value="0"></Action>
+          <Action type="Var" name="进入圆柱" value="0"></Action>
+          <Action type="Var" name="进入圆锥" value="0"></Action>
+          
           <Action type="Var" name="进入棱锥" value="2"></Action>
+   
+          
+          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="373" y="11" Distance="5"></Action>
 
 
-
+        
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥分类对比学习"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥形成动画"  isShow="true" isDevice="false"></Action>
 
           <Action type="Show" value="Main/A_SM_LengZhui"  isShow="true" isDevice="false"></Action>
-     
+
 
 
           <Action type="UIBackPack" devices="棱柱,棱锥,球体,圆柱,圆锥"
@@ -246,15 +268,18 @@
                   
                   ></Action>
 
-          <Action type="UISliderAnim"  title="棱高|棱锥倾斜度|底面边长" targetObj="Main/A_SM_LengZhui">  </Action>
+          <Action type="UISliderAnim" HideObject="Main/A_SM_LengZhui/SM_LengZhui_Xian"  title="棱高|棱锥倾斜度|底面边长" targetObj="Main/A_SM_LengZhui">  </Action>
 
 
         </Action>
       </Enter>
       <Exit>
         <Action type="Sequence">
+
+       
+
           <Action type="Show" value="Main/A_SM_LengZhui"  isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥分类对比学习"  isShow="false" isDevice="false"></Action>
+         
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱锥形成动画"  isShow="false" isDevice="false"></Action>
 
 
@@ -267,11 +292,26 @@
         <Action type="Sequence">
 
           <Action type="Log" value="球体"></Action>
+
+
+
+          <Action type="Var" name="进入棱柱" value="0"></Action>
+          <Action type="Var" name="进入棱锥" value="0"></Action>
+          <Action type="Var" name="进入圆柱" value="0"></Action>
+          <Action type="Var" name="进入圆锥" value="0"></Action>
+          
           <Action type="Var" name="进入球体" value="2"></Action>
+ 
+
+          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="-228" y="25.5" Distance="8"></Action>
+
+
+
+
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体分类对比学习"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体形成动画"  isShow="true" isDevice="false"></Action>
 
-        
+
 
           <Action type="Show" value="Main/A_SM_QiuTi"  isShow="true" isDevice="false"></Action>
 
@@ -292,7 +332,7 @@
                   tiptitle="球体圆心|球体半径"
                   
                   ></Action>
-          <Action type="UISliderAnim"  title="半径" targetObj="Main/A_SM_QiuTi">  </Action>
+          <Action type="UISliderAnim"  HideObject="Main/A_SM_QiuTi/SM_QiuTi_Xian"  title="半径" targetObj="Main/A_SM_QiuTi">  </Action>
 
 
 
@@ -301,6 +341,8 @@
       <Exit>
         <Action type="Sequence">
 
+
+
           <Action type="Show" value="Main/A_SM_QiuTi"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体分类对比学习"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体形成动画"  isShow="false" isDevice="false"></Action>
@@ -316,15 +358,22 @@
       <Enter>
         <Action type="Sequence">
           <Action type="Log" value="圆柱"></Action>
+
+          <Action type="Var" name="进入棱柱" value="0"></Action>
+          <Action type="Var" name="进入棱锥" value="0"></Action>
+          <Action type="Var" name="进入球体" value="0"></Action>
+          <Action type="Var" name="进入圆锥" value="0"></Action>
+          
           <Action type="Var" name="进入圆柱" value="2"></Action>
+       
+          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="-310" y="35.5" Distance="5"></Action>
 
-      
 
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱分类对比学习"  isShow="true" isDevice="false"></Action>
+         
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱形成动画"  isShow="true" isDevice="false"></Action>
 
 
-        
+
           <Action type="Show" value="Main/A_SM_YuanZhu"  isShow="true" isDevice="false"></Action>
 
 
@@ -348,7 +397,7 @@
                  tipaudio=" sound29.mp3|sound30.mp3|sound31.mp3|sound32.mp3|sound33.mp3 "
                   tiptitle="圆柱轴|圆柱底面|圆柱侧面|圆柱母线|圆柱高"
                   ></Action>
-          <Action type="UISliderAnim"  title="上底面半径|底面半径|圆柱高|圆柱倾斜度" targetObj="Main/A_SM_YuanZhu">  </Action>
+          <Action type="UISliderAnim"  HideObject="Main/A_SM_YuanZhu/SM_YuanZhu_Xian" title="上底面半径|底面半径|圆柱倾斜度|圆柱高" targetObj="Main/A_SM_YuanZhu">  </Action>
 
 
 
@@ -356,27 +405,36 @@
       </Enter>
       <Exit>
         <Action type="Sequence">
+   
           <Action type="Show" value="Main/A_SM_YuanZhu"  isShow="false" isDevice="false"></Action>
 
-
+         
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱分类对比学习"  isShow="false" isDevice="false"></Action>
+     
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆柱形成动画"  isShow="false" isDevice="false"></Action>
 
-          
+
 
         </Action>
       </Exit>
     </State>
-  
+
     <State name="圆锥">
       <Enter>
         <Action type="Sequence">
           <Action type="Log" value="圆锥"></Action>
+
+          <Action type="ReSetZhanShiCameraAction" path="ZhanShiCamera" x="-300" y="23.5" Distance="5"></Action>
+
+          <Action type="Var" name="进入棱柱" value="0"></Action>
+          <Action type="Var" name="进入棱锥" value="0"></Action>
+          <Action type="Var" name="进入球体" value="0"></Action>
+          <Action type="Var" name="进入圆柱" value="0"></Action>
           <Action type="Var" name="进入圆锥" value="2"></Action>
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥分类对比学习"  isShow="true" isDevice="false"></Action>
+
+
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥形成动画"  isShow="true" isDevice="false"></Action>
 
-    
+
           <Action type="Show" value="Main/A_SM_YuanZhui"  isShow="true" isDevice="false"></Action>
 
 
@@ -399,7 +457,7 @@
                   ></Action>
           <!--<Action type="UIShow" value="UIGuideTip" isShow="true"></Action>-->
 
-          <Action type="UISliderAnim"  title="底面半径|圆锥倾斜度|圆锥高" targetObj="Main/A_SM_YuanZhui">  </Action>
+          <Action type="UISliderAnim" HideObject="Main/A_SM_YuanZhui/SM_YuanZhui_Xian"  title="底面半径|圆锥倾斜度|圆锥高" targetObj="Main/A_SM_YuanZhui">  </Action>
 
 
 
@@ -407,9 +465,11 @@
       </Enter>
       <Exit>
         <Action type="Sequence">
+        
+          
           <Action type="Show" value="Main/A_SM_YuanZhui"  isShow="false" isDevice="false"></Action>
 
-          <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥分类对比学习"  isShow="false" isDevice="false"></Action>
+        
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/圆锥形成动画"  isShow="false" isDevice="false"></Action>
 
           <!--<Action type="UIShow" value="UIGuideTip" isShow="false"></Action>-->
@@ -420,24 +480,46 @@
     </State>
 
 
-    <State name="棱柱分类对比学习">
+    <State name="分类对比学习">
       <Enter>
         <Action type="Sequence">
-       
+
-          <Action type="Log" value="棱柱分类对比学习！！！！"></Action>
+          <Action type="Log" value="进入分类对比学习！！！！"></Action>
 
           <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
           <Action type="UIShow" value="UISliderAnim" isShow="false"></Action>
           <!--<Action type="UIShow" value="UIBtnAnim" isShow="false"></Action>-->
           <Action type="UIShow" value="UIBackPack" isShow="false"></Action>
-          
+
-          <Action type="DragJiHe" DragItemName="棱柱" TargetObj="多面体" ItemPath="JiHeTi/LengZhu.png"></Action>
+          <Action type="DragJiHe" DragItemName="棱柱|棱锥|球体|圆柱|圆锥" TargetObj="多面体|多面体|旋转体|旋转体|旋转体" ItemPath="JiHeTi/LengZhu.png|JiHeTi/LengZhui.png|JiHeTi/QiuTi.png|JiHeTi/YuanZhu.png|JiHeTi/YuanZhui.png"></Action>
           <Condition type="StrEvent" value="UIImageSelectMap_JiHe使用结束"></Condition>
 
-          
+          <!--根据当前的状态，返回不同的分组-->
+  
+          <Action type="Any">
 
+          <Action type="Sequence">
+            <Condition type="Var" name="进入棱柱" value="2"></Condition>
+            <Action type="Var" name="进入棱柱" value="1"></Action>
+          </Action>
+          <Action type="Sequence">
+            <Condition type="Var" name="进入棱锥" value="2"></Condition>
+            <Action type="Var" name="进入棱锥" value="1"></Action>
+          </Action>
+          <Action type="Sequence">
+            <Condition type="Var" name="进入球体" value="2"></Condition>
+            <Action type="Var" name="进入球体" value="1"></Action>
+          </Action>
+          <Action type="Sequence">
+            <Condition type="Var" name="进入圆柱" value="2"></Condition>
+            <Action type="Var" name="进入圆柱" value="1"></Action>
+          </Action>
+          <Action type="Sequence">
+            <Condition type="Var" name="进入圆锥" value="2"></Condition>
+            <Action type="Var" name="进入圆锥" value="1"></Action>
+          </Action>
 
-          <Action type="Var" name="进入棱柱" value="1"></Action>
+          </Action>
 
           <Action type="Log" value="Enter Sequence分类对比学习 退出？？？"></Action>
 
@@ -447,136 +529,13 @@
         <Action type="Sequence">
 
 
-          <Action type="Log" value="退出棱柱分类对比学习！！！！"></Action>
+          <Action type="Log" value="退出分类对比学习！！！！"></Action>
 
         </Action>
       </Exit>
     </State>
 
-    <State name="棱锥分类对比学习">
-      <Enter>
-        <Action type="Sequence">
 
-          <Action type="Log" value="棱柱分类对比学习！！！！"></Action>
-
-          <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
-          <Action type="UIShow" value="UISliderAnim" isShow="false"></Action>
-          <!--<Action type="UIShow" value="UIBtnAnim" isShow="false"></Action>-->
-          <Action type="UIShow" value="UIBackPack" isShow="false"></Action>
-
-          <Action type="DragJiHe" DragItemName="棱锥" TargetObj="多面体" ItemPath="JiHeTi/LengZhui.png"></Action>
-
-
-          <Condition type="StrEvent" value="UIImageSelectMap_JiHe使用结束"></Condition>
-
-          <Action type="Var" name="进入棱锥" value="1"></Action>
-
-
-        </Action>
-      </Enter>
-      <Exit>
-        <Action type="Sequence">
-
-
-          <Action type="Log" value="退出 棱锥 分类对比学习！！！！"></Action>
-
-        </Action>
-      </Exit>
-    </State>
-
-    <State name="球体分类对比学习">
-      <Enter>
-        <Action type="Sequence">
-
-          <Action type="Log" value="球体分类对比学习！！！！"></Action>
-
-          <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
-          <Action type="UIShow" value="UISliderAnim" isShow="false"></Action>
-          <!--<Action type="UIShow" value="UIBtnAnim" isShow="false"></Action>-->
-          <Action type="UIShow" value="UIBackPack" isShow="false"></Action>
-
-          <Action type="DragJiHe" DragItemName="球体" TargetObj="旋转体" ItemPath="JiHeTi/QiuTi.png"></Action>
-
-
-          <Condition type="StrEvent" value="UIImageSelectMap_JiHe使用结束"></Condition>
-
-          <Action type="Var" name="进入球体" value="1"></Action>
-
-
-        </Action>
-      </Enter>
-      <Exit>
-        <Action type="Sequence">
-
-
-          <Action type="Log" value="退出   球体分类对比学习   ！！！！"></Action>
-
-        </Action>
-      </Exit>
-    </State>
-  
-    
-    <State name="圆柱分类对比学习">
-      <Enter>
-        <Action type="Sequence">
-
-          <Action type="Log" value="圆柱分类对比学习！！！！"></Action>
-
-          <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
-          <Action type="UIShow" value="UISliderAnim" isShow="false"></Action>
-          <!--<Action type="UIShow" value="UIBtnAnim" isShow="false"></Action>-->
-          <Action type="UIShow" value="UIBackPack" isShow="false"></Action>
-
-          <Action type="DragJiHe" DragItemName="圆柱" TargetObj="旋转体" ItemPath="JiHeTi/YuanZhu.png"></Action>
-
-
-          <Condition type="StrEvent" value="UIImageSelectMap_JiHe使用结束"></Condition>
-
-          <Action type="Var" name="进入圆柱" value="1"></Action>
-
-
-        </Action>
-      </Enter>
-      <Exit>
-        <Action type="Sequence">
-
-
-          <Action type="Log" value="退出圆柱分类对比学习！！！！"></Action>
-
-        </Action>
-      </Exit>
-    </State>
-   
-    <State name="圆锥分类对比学习">
-      <Enter>
-        <Action type="Sequence">
-
-          <Action type="Log" value="圆锥分类对比学习！！！！"></Action>
-
-          <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
-          <Action type="UIShow" value="UISliderAnim" isShow="false"></Action>
-          <!--<Action type="UIShow" value="UIBtnAnim" isShow="false"></Action>-->
-          <Action type="UIShow" value="UIBackPack" isShow="false"></Action>
-
-          <Action type="DragJiHe" DragItemName="圆锥" TargetObj="旋转体" ItemPath="JiHeTi/YuanZhui.png"></Action>
-
-
-          <Condition type="StrEvent" value="UIImageSelectMap_JiHe使用结束"></Condition>
-
-          <Action type="Var" name="进入圆锥" value="1"></Action>
-
-
-        </Action>
-      </Enter>
-      <Exit>
-        <Action type="Sequence">
-
-
-          <Action type="Log" value="退出 圆锥 分类对比学习！！！！"></Action>
-
-        </Action>
-      </Exit>
-    </State>
 
 
     <State name="棱柱形成动画">
@@ -586,12 +545,12 @@
 
           <Action type="Var" name="进入棱柱" value="2"></Action>
 
-      
+
           <Action type="UIShow" value="UIGuideTip" isShow="false"></Action>
-       
+
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱分类对比学习"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/棱柱形成动画"  isShow="true" isDevice="false"></Action>
-     
+
           <Action type="Show" value="Main/A_SM_LengZhu"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="Main/A_SM_LengZhuAnim"  isShow="true" isDevice="false"></Action>
 
@@ -678,7 +637,7 @@
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体分类对比学习"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="UIRoot/Common/UIBtns/BtnContent/球体形成动画"  isShow="true" isDevice="false"></Action>
 
-          
+
           <Action type="Show" value="Main/A_SM_QiuTi"  isShow="false" isDevice="false"></Action>
           <Action type="Show" value="Main/A_SM_QiuTiAnim"  isShow="true" isDevice="false"></Action>
 
@@ -853,8 +812,8 @@
 
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/棱柱"></Condition>
     </Transision>
-    
+
-    
+
     <Transision from="any" to="棱锥">
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/棱锥"></Condition>
     </Transision>
@@ -867,24 +826,12 @@
     <Transision from="any" to="圆锥">
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/圆锥"></Condition>
     </Transision>
-    
+
-    
+
-    <Transision from="any" to="棱柱分类对比学习">
+    <Transision from="any" to="分类对比学习">
-      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/棱柱分类对比学习"></Condition>
+      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/分类对比学习"></Condition>
     </Transision>
 
-    <Transision from="any" to="棱锥分类对比学习">
-      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/棱锥分类对比学习"></Condition>
-    </Transision>
-    <Transision from="any" to="球体分类对比学习">
-      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/球体分类对比学习"></Condition>
-    </Transision>
-    <Transision from="any" to="圆柱分类对比学习">
-      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/圆柱分类对比学习"></Condition>
-    </Transision>
-    <Transision from="any" to="圆锥分类对比学习">
-      <Condition type="UIClick" value="UIRoot/Common/UIBtns/BtnContent/圆锥分类对比学习"></Condition>
-    </Transision>
 
 
   </FSM>

Data/Xml/02_ShiXun.xml

@@ -131,6 +131,8 @@
           <Action type="Show" value="Canvas/DaTiUI"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="Canvas/DaTiUI/公式Bg"  isShow="true" isDevice="false"></Action>
           <Action type="Show" value="Canvas/DaTiUI/公式Bg/棱柱"  isShow="true" isDevice="false"></Action>
+      
+          <Action type="Video" value="01.mp4" size="800,500" offset="-249.921,10" finishedEvent="finished" closeEvent="close"></Action>