4.2上午提交

This commit is contained in:
taosuqi 2025-04-02 10:02:26 +08:00
parent 273ce62cb3
commit 175d23ef0a
13 changed files with 3309 additions and 15 deletions

BIN
Assets/Models/盆.fbx Normal file

Binary file not shown.

107
Assets/Models/盆.fbx.meta Normal file
View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 2cbec60f0e5cd11498384ea6e6b457e8
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 1
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -247,7 +247,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17423266, g: 0.1981132, b: 0.17101282, a: 1}
m_Color: {r: 0.4442417, g: 0.6320754, b: 0.4442417, a: 0}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

View File

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

View File

@ -0,0 +1,268 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1469621495174429123
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3576098577725126229}
- component: {fileID: 7937030410680253446}
m_Layer: 5
m_Name: UI_FadePanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3576098577725126229
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469621495174429123}
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: 24117921517295134}
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 &7937030410680253446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469621495174429123}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 94deccb254fae3542ae09bf91e3fdba9, type: 3}
m_Name:
m_EditorClassIdentifier:
FadeString: "\u7CBE\u9009\u540E\u7684\u79CD\u5B50\u53EF\u75280.1%\u7684\u78F7\u9178\u4E8C\u6C22\u94BE\u6EB6\u6DB2\u6216\u75283%\u5E7F\u67AF\u5B81\u6C34\u5242\u6D78\u6CE112\uFF5E14\u5C0F\u65F6\uFF0C\u5176\u95F4\u6362\u6C341\uFF5E2\u6B21\uFF0C\u5F85\u79CD\u5B50\u5438\u80C0\u540E\u635E\u8D77\u6EE4\u5E72\uFF0C\u50AC\u82BD\u81F3\u7C89\u5634\u64AD\u79CD\u3002"
FadeBg: {fileID: 7253412348453028916}
FadetextMeshProUGUI: {fileID: 6230927242917436868}
typeTime: 0.1
--- !u!1 &2479851535666228794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 24117921517295134}
- component: {fileID: 4883378950650806132}
- component: {fileID: 7253412348453028916}
m_Layer: 5
m_Name: BG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &24117921517295134
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2479851535666228794}
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: 187423510271570163}
m_Father: {fileID: 3576098577725126229}
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: -49.80487}
m_SizeDelta: {x: 0, y: -99.6097}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4883378950650806132
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2479851535666228794}
m_CullTransparentMesh: 1
--- !u!114 &7253412348453028916
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2479851535666228794}
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, g: 0, b: 0, 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!1 &3183161874849895602
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 187423510271570163}
- component: {fileID: 4813177133885591797}
- component: {fileID: 6230927242917436868}
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 &187423510271570163
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3183161874849895602}
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: 24117921517295134}
m_RootOrder: 0
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.000019073, y: 0.0000047684}
m_SizeDelta: {x: 992.5417, y: 369.5394}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4813177133885591797
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3183161874849895602}
m_CullTransparentMesh: 1
--- !u!114 &6230927242917436868
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3183161874849895602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 3333333
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: 4284995966
m_fontColor: {r: 0.49231747, g: 0.8490566, b: 0.40450338, 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: 52.55
m_fontSizeBase: 52.55
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}

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -21,7 +21,7 @@ public class OnMouseObj : MonoBehaviour
{
return;
}
TipItem.Instance.HideTips();
}
private void OnMouseEnter()

View File

@ -1,5 +1,5 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CameraManager : MonoBehaviour
@ -7,10 +7,68 @@ public class CameraManager : MonoBehaviour
public static CameraManager instance;
public Camera Camera;
/// <summary>
/// 所有的种子
/// </summary>
public GameObject[] seed_Obj;
public Transform[] StepTrans;
public GameObject SeedWater_Obj;
public GameObject water_Obj;
private void Awake()
{
instance = this;
}
private void Update()
{
if (Input.GetMouseButtonDown(0))
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit;
bool raycast = Physics.Raycast(ray, out hit);
if (raycast)
{
if (hit.collider.gameObject.tag.Equals("CompleteSeeds"))
{
Debug.Log("被点击物体的标签是" + hit.collider.gameObject.tag);
hit.collider.gameObject.SetActive(false);
bool allSeedsHidden = true;
for (int i = 0; i < seed_Obj.Length; i++)
{
if (seed_Obj[i].activeInHierarchy)
{
allSeedsHidden = false;
Debug.Log("还有种子没有点到");
break; // 只要有一个种子没隐藏,就退出循环
}
}
// 检查是否所有种子都被隐藏(放在循环外)
if (allSeedsHidden)
{
Debug.Log("所有种子都被隐藏");
Camera.fieldOfView = 60;
StartCoroutine(SeedIsFalse());
}
}
}
}
}
public IEnumerator SeedIsFalse()
{
Camera.transform.SetPositionAndRotation
(StepTrans[2].transform.position, StepTrans[1].transform.rotation);
yield return new WaitForSeconds(1f);
SeedWater_Obj.transform.DOMoveY(0, 1f);
yield return new WaitForSeconds(2.1f);
water_Obj.transform.DOMoveY(0.1f, 1.5f);
yield return new WaitForSeconds(2.5f);
UI_FadePanel.Instance.Init();
yield return new WaitForSeconds(5f);
}
}

View File

@ -56,6 +56,9 @@ public class UIManager
private TipItem tipItemPrefab;
public TipItem tipItem;
private UI_FadePanel _FadePanelPrefab;
public UI_FadePanel fadePanel;
/// <summary>
/// 构造函数
@ -67,6 +70,9 @@ public class UIManager
tipItemPrefab = ResourcesManager.Load<TipItem>("UI/UI_Item/TipItem/TipItem");
tipItem = GameObject.Instantiate(tipItemPrefab, canvas);
tipItem.HideTips();
_FadePanelPrefab = ResourcesManager.Load<UI_FadePanel>("UI/UI_Item/UI_FadePanel/UI_FadePanel");
fadePanel = GameObject.Instantiate(_FadePanelPrefab, canvas);
fadePanel.HidePanel();
layers = new Transform[]
{
canvas.transform.Find("Bot"),

View File

@ -82,6 +82,7 @@ public class UI_StepsPanel : BasePanel
break;
case "育苗前种子处理":
Debug.Log("育苗前种子处理");
CameraManager.instance.Camera.fieldOfView = 25;
CameraManager.instance.Camera.transform.SetPositionAndRotation
(CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation);
break;
@ -91,6 +92,7 @@ public class UI_StepsPanel : BasePanel
break;
case "精细整地要求":
Debug.Log("精细整地要求");
CameraManager.instance.Camera.fieldOfView = 60;
CameraManager.instance.Camera.transform.SetPositionAndRotation
(CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType., true);

View File

@ -0,0 +1,47 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
public class UI_FadePanel : MonoBehaviour
{
public static UI_FadePanel Instance;
public string FadeString;
public Image FadeBg;
/// <summary>
/// Îı¾
/// </summary>
public TextMeshProUGUI FadetextMeshProUGUI;
public float typeTime;
private void Awake()
{
Instance = this;
}
public void Init()
{
gameObject.SetActive(true);
FadeBg.DOFade(1,0.1f);
StartCoroutine(Typing(FadetextMeshProUGUI, FadeString));
}
public void HidePanel()
{
gameObject.SetActive(false);
}
public IEnumerator Typing(TextMeshProUGUI text ,string a)
{
text.text = string.Empty;
string strTemp = string.Empty;
for (int i = 0; i < a.Length; i++)
{
yield return new WaitForSeconds(typeTime);
strTemp += a[i];
text.text = strTemp;
}
}
}

View File

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