4.1下午提交

Assets/Anim/深翻耕耕田.controller

@@ -1,6 +1,59 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-6359706221483816217
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u6DF1\u7FFB\u8015\u8015\u7530"
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: isture
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 3053574834037254230}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &3053574834037254230
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5171215104099410714}
+    m_Position: {x: 380, y: -30, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4064138222152441558}
+    m_Position: {x: 450, y: 190, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 5171215104099410714}
+--- !u!1102 &4064138222152441558
 AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
@@ -26,47 +79,55 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!91 &9100000
+--- !u!1101 &5032186466714932275
-AnimatorController:
+AnimatorStateTransition:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: "\u6DF1\u7FFB\u8015\u8015\u7530"
+  m_Name: 
-  serializedVersion: 5
+  m_Conditions:
-  m_AnimatorParameters: []
+  - m_ConditionMode: 1
-  m_AnimatorLayers:
+    m_ConditionEvent: isture
-  - serializedVersion: 5
+    m_EventTreshold: 0
-    m_Name: Base Layer
+  m_DstStateMachine: {fileID: 0}
-    m_StateMachine: {fileID: 3053574834037254230}
+  m_DstState: {fileID: 4064138222152441558}
-    m_Mask: {fileID: 0}
+  m_Solo: 0
-    m_Motions: []
+  m_Mute: 0
-    m_Behaviours: []
+  m_IsExit: 0
-    m_BlendingMode: 0
+  serializedVersion: 3
-    m_SyncedLayerIndex: -1
+  m_TransitionDuration: 0.25
-    m_DefaultWeight: 0
+  m_TransitionOffset: 0
-    m_IKPass: 0
+  m_ExitTime: 0.75
-    m_SyncedLayerAffectsTiming: 0
+  m_HasExitTime: 1
-    m_Controller: {fileID: 9100000}
+  m_HasFixedDuration: 1
---- !u!1107 &3053574834037254230
+  m_InterruptionSource: 0
-AnimatorStateMachine:
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &5171215104099410714
+AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
+  m_Name: New State
-  m_ChildStates:
+  m_Speed: 1
-  - serializedVersion: 1
+  m_CycleOffset: 0
-    m_State: {fileID: -6359706221483816217}
+  m_Transitions:
-    m_Position: {x: 440, y: 50, z: 0}
+  - {fileID: 5032186466714932275}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_Position: {x: 50, y: 50, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_IKOnFeet: 0
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_WriteDefaultValues: 1
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_Mirror: 0
-  m_DefaultState: {fileID: -6359706221483816217}
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Controller/翻耕杂草.controller

@@ -12,6 +12,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -2246181542724801638}
     m_Position: {x: 460, y: 100, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3754870744753759499}
+    m_Position: {x: 377.58618, y: -68.79309, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -21,7 +24,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -2246181542724801638}
+  m_DefaultState: {fileID: 3754870744753759499}
 --- !u!1102 &-2246181542724801638
 AnimatorState:
   serializedVersion: 6
@@ -56,7 +59,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: "\u7FFB\u8015\u6742\u8349"
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: New Bool
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -70,3 +79,55 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &2644429722391689534
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: New Bool
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2246181542724801638}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &3754870744753759499
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 2644429722391689534}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Models/Materials/gaoliangzhongzi_BaseColor.mat.meta

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

Assets/Models/Materials/竹筛子.mat

@@ -79,6 +79,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.8679245, g: 0.84115, b: 0.6755073, a: 1}
+    - _Color: {r: 0.5754717, g: 0.55259246, b: 0.41531682, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Resources/UI/UI_Item/TipItem.meta

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

Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab

@@ -0,0 +1,266 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1746904435453591611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7833148191064684855}
+  - component: {fileID: 4877856549064647994}
+  - component: {fileID: 3694832005926275004}
+  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 &7833148191064684855
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1746904435453591611}
+  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: 6610806534929955135}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4877856549064647994
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1746904435453591611}
+  m_CullTransparentMesh: 1
+--- !u!114 &3694832005926275004
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1746904435453591611}
+  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: "\u9676\u82CF\u5947"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+  m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, 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: 25
+  m_fontSizeBase: 25
+  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 &6264449912629767679
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3769508263541870363}
+  - component: {fileID: 4598224748823573264}
+  m_Layer: 5
+  m_Name: TipItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3769508263541870363
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6264449912629767679}
+  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: 6610806534929955135}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4598224748823573264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6264449912629767679}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: db8907eaaea654748afa910b3766395c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Tip_Text: {fileID: 3694832005926275004}
+  bg: {fileID: 6610806534929955135}
+--- !u!1 &7707713486081785312
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6610806534929955135}
+  - component: {fileID: 5266912955419536082}
+  - component: {fileID: 6040622801465203818}
+  m_Layer: 5
+  m_Name: Tip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6610806534929955135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7707713486081785312}
+  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: 7833148191064684855}
+  m_Father: {fileID: 3769508263541870363}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 493}
+  m_SizeDelta: {x: 222.8462, y: 68.8417}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &5266912955419536082
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7707713486081785312}
+  m_CullTransparentMesh: 1
+--- !u!114 &6040622801465203818
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7707713486081785312}
+  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: 0.17423266, g: 0.1981132, b: 0.17101282, 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_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

Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 369bb34e3eab7224e85287d1d6403821
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/UI_Item/UI_StepsPanel/UI_StepsPanelItem.prefab

@@ -51,6 +51,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Step_Text: {fileID: 8102979459814448756}
+  Step_Btn: {fileID: 7365484768592982085}
 --- !u!1 &3682663510837742324
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Bootstrap.cs

@@ -20,9 +20,7 @@ public class Bootstrap : SingletonMono<Bootstrap>
         scenesManager = new ScenesManager();
         pptFolderName = Application.streamingAssetsPath + "/PPT";
         LoadPPTTest.PPTFiles(pptFolderName);
-        ppts =LoadPPTTest.PPTName();
+        ppts = LoadPPTTest.PPTName();
-        //await LoadWithUniTask();
-
         DontDestroyOnLoad(gameObject);
     }
 
@@ -60,24 +58,7 @@ public class Bootstrap : SingletonMono<Bootstrap>
     // Update is called once per frame
     void Update()
     {
-        //if (Input.GetKeyDown("s"))
+
-        //{
+
-        //    Debug.Log("Input.GetKeyDown(\"u\")");
-        //    uiManager.ShowPanel<UI_TestPanel>(this, E_UI_Layer.Bot, (panel) =>
-        //    {
-        //        panel.OnInit();
-        //        Debug.Log("UI_TestPanelÏÔʾ³É¹¦");
-        //    });
-        //}
-        //if (Input.GetKeyDown("h"))
-        //{
-        //    Debug.Log("Input.GetKeyDown(\"h\")");
-        //    uiManager.HidePanel<UI_TestPanel>();
-        //}
-        //if (Input.GetKeyDown("e"))
-        //{
-        //    Debug.Log("Input.GetKeyDown(\"e\")");
-        //    eventCenter.EventTrigger(Enum_EventType.TestEvent1);
-        //}
     }
 }

Assets/Scripts/OnMouseObj.cs

@@ -0,0 +1,49 @@
+using HighlightPlus;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+/// <summary>
+/// ÎïÌå¸ßÁÁ
+/// </summary>
+public class OnMouseObj : MonoBehaviour
+{
+    private HighlightEffect _highlight;
+
+    private void Awake()
+    {
+        _highlight = GetComponent<HighlightEffect>();
+    }
+    private void OnMouseDown()
+    {
+        if (EventSystem.current.IsPointerOverGameObject())
+        {
+            return;
+        }
+
+    }
+
+    private void OnMouseEnter()
+    {
+        if (EventSystem.current.IsPointerOverGameObject())
+        {
+            return;
+        }
+        Debug.Log(gameObject.name);
+        _highlight.highlighted = true;
+        Vector3 pos = Camera.main.WorldToScreenPoint(transform.position);
+        TipItem.Instance.ShwoTips(this.gameObject.name, pos);
+    }
+
+    private void OnMouseExit()
+    {
+        if (EventSystem.current.IsPointerOverGameObject())
+        {
+            return;
+        }
+        _highlight.highlighted = false;
+        TipItem.Instance.HideTips();
+    }
+
+}

Assets/Scripts/OnMouseObj.cs.meta

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

Assets/Scripts/Project/ProjectBase/CameraManager.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CameraManager : MonoBehaviour
+{
+    public static CameraManager instance;
+    public Camera Camera;
+
+    public Transform[] StepTrans;
+
+    private void Awake()
+    {
+        instance = this;
+    }
+}

Assets/Scripts/Project/ProjectBase/CameraManager.cs.meta

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

Assets/Scripts/Project/ProjectBase/EventCenter/Enum_EventType.cs

@@ -11,5 +11,13 @@ public enum Enum_EventType
     TestEvent1,
     TestEvent2,
     TestEvent3,
-    UpdateProgress
+    UpdateProgress,
+    拖车
+
 }
+ 
+//public enum Enum_ClickObj
+//{
+//    None,
+//    拖车,
+//}

Assets/Scripts/Project/ProjectBase/RayClliderManager.cs

@@ -0,0 +1,51 @@
+using HighlightPlus;
+using UnityEngine;
+using UnityEngine.Playables;
+
+public class RayClliderManager : MonoBehaviour
+{
+    public PlayableDirector TuoChe_PlayableDirector;
+
+    public Animator Gengtian_animator;
+    public HighlightEffect TuoChe_highlightEffect;
+    public bool TuoChe_enabled;
+    // Start is called before the first frame update
+    void Start()
+    {
+        Gengtian_animator.enabled = false;
+        if (Bootstrap.Instance != null)
+      
+        Bootstrap.Instance.eventCenter.AddEventListener<bool>(Enum_EventType.Íϳµ, TuoCheEnabled);
+    }
+
+    private void TuoCheEnabled(bool value)
+    {
+        TuoChe_enabled = value;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Input.GetMouseButtonDown(0) && TuoChe_enabled)
+        {
+            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+            RaycastHit hit;
+            bool raycast = Physics.Raycast(ray, out hit);
+            if (raycast)
+            {
+                if (hit.collider.gameObject.name.Equals("Íϳµ"))
+                {
+                    Gengtian_animator.enabled = true;
+                    TuoChe_highlightEffect.highlighted = false;
+                    TuoChe_PlayableDirector.Play();
+                }
+            }
+        }
+    }
+
+    private void OnDisable()
+    {
+        if (Bootstrap.Instance != null)
+            Bootstrap.Instance.eventCenter.RemoveEventListener<bool>(Enum_EventType.Íϳµ, TuoCheEnabled);
+    }
+}

Assets/Scripts/Project/ProjectBase/RayClliderManager.cs.meta

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

Assets/Scripts/Project/ProjectBase/UIManager/UIManager.cs

@@ -53,6 +53,9 @@ public class UIManager
     private readonly Dictionary<string, BasePanel> panelDic = new Dictionary<string, BasePanel>();
 
 
+    private TipItem tipItemPrefab;
+    public TipItem tipItem;
+
 
     /// <summary>
     /// 构造函数
@@ -61,6 +64,9 @@ public class UIManager
     {
         canvas = ResourcesManager.Load<GameObject>("UI/Base/Canvas").GetComponent<RectTransform>();
         GameObject.DontDestroyOnLoad(canvas.gameObject);
+        tipItemPrefab = ResourcesManager.Load<TipItem>("UI/UI_Item/TipItem/TipItem");
+        tipItem = GameObject.Instantiate(tipItemPrefab, canvas);
+        tipItem.HideTips();
         layers = new Transform[]
         {
             canvas.transform.Find("Bot"),
@@ -68,6 +74,7 @@ public class UIManager
             canvas.transform.Find("Top"),
             canvas.transform.Find("System")
         };
+
     }
 
     /// <summary>

Assets/Scripts/Test/LoadPPTTest.cs

@@ -7,11 +7,12 @@ using System.Collections.Generic;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
+using TMPro;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 
-public class LoadPPTTest
+public static class LoadPPTTest
 {
     /// <summary>
     /// 
@@ -156,6 +157,17 @@ public class LoadPPTTest
         LayoutRebuilder.ForceRebuildLayoutImmediate(content as RectTransform);
         scrollRect.verticalNormalizedPosition = 1; // 回到顶部
     }
+
+    /// <summary>
+    /// 根据文字数量改变 背景 大小
+    /// </summary>
+    /// <param name="contentText"></param>
+    public static void AdjustImageWidth(TextMeshProUGUI contentText, RectTransform _bg, float width, float height)
+    {
+        float preferredWidth = contentText.preferredWidth;
+        _bg.sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), _bg.sizeDelta.y);
+        contentText.GetComponent<RectTransform>().sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : width), height);
+    }
 }
 
 //public class LoadPPTTest : MonoBehaviour

Assets/Scripts/TipItem.cs

@@ -0,0 +1,26 @@
+using UnityEngine.UI;
+using TMPro;
+using UnityEngine;
+public class TipItem : MonoBehaviour
+{
+    public static TipItem Instance;
+    public TextMeshProUGUI Tip_Text;
+    public RectTransform bg;
+
+    private void Awake()
+    {
+        Instance = this;
+    }
+    public void ShwoTips(string Item, Vector3 pos)
+    {
+        gameObject.SetActive(true);
+        Tip_Text.text = Item;
+        GetComponent<RectTransform>().position = pos;
+        LoadPPTTest.AdjustImageWidth(Tip_Text, bg, 30, 52);
+    }
+
+    public void HideTips()
+    {
+        gameObject.SetActive(false);
+    }
+}

Assets/Scripts/TipItem.cs.meta

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

Assets/Scripts/UI/UIItem/UI_StepsPanelItem.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class UI_StepsPanelItem : BaseItem
 {
@@ -10,6 +11,11 @@ public class UI_StepsPanelItem : BaseItem
     /// </summary>
     public TextMeshProUGUI Step_Text;
 
+    /// <summary>
+    /// ²½Öè°´Å¥
+    /// </summary>
+    public Button Step_Btn;
+
     public void Init(string LabelDate)
     {
         Step_Text.text = LabelDate;

Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs

@@ -20,11 +20,11 @@ public class UI_StepsPanel : BasePanel
     public UI_StepsPanelItem StepsItem;
 
     public PptFilesData data = new PptFilesData();
+    
 
     public string jsonFileName = "StepsConfig"; // JSON文件名
     protected override void Awake()
     {
-        base.Awake();
         data = JsonManager.LoadData<PptFilesData>(jsonFileName);
         foreach (var pptFile in data.pptFiles)
         {
@@ -38,6 +38,8 @@ public class UI_StepsPanel : BasePanel
             var item = Instantiate(StepsItem, StepsContent);
             item.Init(pptFile.fileName);
             var buttonText = item.GetComponentInChildren<TextMeshProUGUI>();
+            Button button  = item.GetComponentInChildren<Button>();
+            button.name = pptFile.fileName;
             if (buttonText != null)
             {
                 buttonText.text = $"{pptFile.fileName}";
@@ -52,6 +54,7 @@ public class UI_StepsPanel : BasePanel
             // 设置按钮文本
             
         }
+        base.Awake();
     }
 
     public override void ShowMe()
@@ -74,7 +77,47 @@ public class UI_StepsPanel : BasePanel
                 {
                     Debug.Log("UI_StepsPanel已经显示在" + E_UI_Layer.System);
                     Bootstrap.Instance.uiManager.HidePanel<UI_TipsForPracticePanel>();
+                    Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.拖车, false);
                 });
+                break;
+            case "育苗前种子处理":
+                Debug.Log("育苗前种子处理");
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
+                    (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation);
+                break;
+            case "播撒育苗技术流程":
+                Debug.Log("播撒育苗技术流程");
+
+                break;
+            case "精细整地要求":
+                Debug.Log("精细整地要求");
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
+                    (CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
+                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.拖车, true);
+                break;
+            case "苗龄与叶龄标准":
+                Debug.Log("育苗前种子处理");
+
+                break;
+            case "移栽时机和方式管理":
+                Debug.Log("移栽时机和方式管理");
+
+                break;
+            case "移栽后管理":
+                Debug.Log("移栽后管理");
+
+                break;
+            case "田间管理":
+                Debug.Log("田间管理");
+
+                break;
+            case "病虫害防治":
+                Debug.Log("病虫害防治");
+
+                break;
+            case "种子收货与储藏":
+                Debug.Log("种子收货与储藏");
+
                 break;
             default:
                 break;

Assets/TimeLine/拖车耕地timeline.playable

@@ -89,7 +89,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.9833333333333334
+    m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -6479589498798118300}
     m_Duration: 44.766666666666666
@@ -155,7 +155,7 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 1.9833333333333334
+    m_PreExtrapolationTime: 0
     m_DisplayName: "\u7FFB\u8015\u6742\u8349"
   m_Markers:
     m_Objects: []
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.9833333333333334
+    m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6104464813659397867}
     m_Duration: 47
@@ -265,7 +265,7 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 1.9833333333333334
+    m_PreExtrapolationTime: 0
     m_DisplayName: "\u62D6\u8F66\u52A8\u753B"
   m_Markers:
     m_Objects: []
@@ -309,7 +309,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.9833333333333334
+    m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -8064519266781770682}
     m_Duration: 47.2
@@ -375,7 +375,7 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 1.9833333333333334
+    m_PreExtrapolationTime: 0
     m_DisplayName: "\u6DF1\u7FFB\u8015\u7530"
   m_Markers:
     m_Objects: []
@@ -397,6 +397,29 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &4552909890235621888
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 2a16748d9461eae46a725db9776d5390, type: 3}
+  m_Name: Markers
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
 --- !u!114 &6104464813659397867
 MonoBehaviour:
   m_ObjectHideFlags: 1