no message

1 year ago · 1934bfe7c9
parent 5c004b9d78
commit 1934bfe7c9
15 changed files with 1494 additions and 1588 deletions
--- a/Assets/Mesh/NPC.controller
+++ b/Assets/Mesh/NPC.controller
@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!1102 &-9068569697077069658
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -21,7 +21,8 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3}
+  m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc,
+    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@ -29,7 +30,7 @@ AnimatorState:
  m_TimeParameter: 
 --- !u!1107 &-7155772280476875541
 AnimatorStateMachine:
-  serializedVersion: 6
+  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -44,7 +45,7 @@ AnimatorStateMachine:
    m_Position: {x: 110, y: 90, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6531731146847969896}
-    m_Position: {x: 440, y: 10, z: 0}
+    m_Position: {x: 110, y: -120, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7802149682489576577}
    m_Position: {x: -39.964172, y: 316.8243, z: 0}
@ -53,14 +54,14 @@ AnimatorStateMachine:
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: -110, y: 30, z: 0}
  m_EntryPosition: {x: -110, y: 100, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 6136116136866434829}
 --- !u!1102 &-6531731146847969896
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -78,7 +79,8 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3}
+  m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc,
+    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@ -123,13 +125,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Squat
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -145,7 +147,7 @@ AnimatorController:
    m_Controller: {fileID: 9100000}
 --- !u!1102 &6136116136866434829
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -198,7 +200,7 @@ AnimatorStateTransition:
  m_CanTransitionToSelf: 1
 --- !u!1102 &7802149682489576577
 AnimatorState:
-  serializedVersion: 6
+  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -216,7 +218,8 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239, type: 3}
+  m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239,
+    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
--- a/Assets/Resources/Prefab/Selected
+++ b/Assets/Resources/Prefab/Selected
@ -27,17 +27,17 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7156321317879884023}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 1.9784528}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 7156321317989403289}
  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_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 7.550232, y: -177.58029}
+  m_SizeDelta: {x: 120, y: 74.7}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7156321317879884019
 CanvasRenderer:
@ -61,11 +61,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 0.5137339, g: 1, b: 0.41037738, a: 1}
-<<<<<<<< HEAD:Assets/Resources/Prefab/Selected (1).prefab
  m_RaycastTarget: 1
-========
-  m_RaycastTarget: 0
->>>>>>>> afcf818 (合):Assets/Resources/Selected.prefab
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
--- a/Assets/Resources/Prefab/Selected
+++ b/Assets/Resources/Prefab/Selected
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 685d7e505ac96994c82365156910a290
+guid: 6d8487659eb88514b9ce9a69b7580cb1
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Resources/Selected.prefab.meta
+++ b/Assets/Resources/Selected.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dd978378f2722054fbf819b007935467
+guid: 685d7e505ac96994c82365156910a290
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Resources/Standalone.meta
+++ b/Assets/Resources/Standalone.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 56134257d444bc7478c8067fb1cadc43
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/img/left.png
+++ b/Assets/Resources/img/left.png
--- a/Assets/Resources/img/left.png.meta
+++ b/Assets/Resources/img/left.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 259420e959ed26a48b4d31917807d2a4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/img/right.png
+++ b/Assets/Resources/img/right.png
--- a/Assets/Resources/img/right.png.meta
+++ b/Assets/Resources/img/right.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 42187a85a07cf2949ab0cf7ba6ccc777
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Level1.unity
+++ b/Assets/Scenes/Level1.unity
--- a/Assets/Scenes/Level2.unity
+++ b/Assets/Scenes/Level2.unity
@ -4476,8 +4476,8 @@ MonoBehaviour:
  m_TargetGraphic: {fileID: 109739736}
  m_HandleRect: {fileID: 109739735}
  m_Direction: 2
-  m_Value: 1.0000004
-  m_Size: 0.7244993
+  m_Value: 1
+  m_Size: 0.7244992
  m_NumberOfSteps: 0
  m_OnValueChanged:
    m_PersistentCalls:
@ -23184,6 +23184,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  yishi: {fileID: 0}
  yifu: {fileID: 0}
+  errorTip: {fileID: 0}
 --- !u!1001 &881170073
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -53374,6 +53375,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  yishi: {fileID: 224519137}
  yifu: {fileID: 2059532709431411459}
+  errorTip: {fileID: 1148200630}
 --- !u!23 &628529072576343314
 MeshRenderer:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Level1/Canvas.cs
+++ b/Assets/Scripts/Level1/Canvas.cs
@ -73,7 +73,10 @@ public class Canvas : MonoBehaviour
            GameObject obj = Instantiate(Resources.Load<GameObject>("operate"),GameObject.FindWithTag("Grid").transform);
            obj.GetComponent<Operate>().str = "2-清理周边环境";
            step1_2.SetActive(false);
+            errorTip.SetActive(true);
+            errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
            EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
+            
        }
        else {
            errorTip.SetActive(true);
@ -88,11 +91,12 @@ public class Canvas : MonoBehaviour
            obj.GetComponent<Operate>().str = "1-确认现场环境安全";
            if ((bool)data[1])
            {
+                errorTip.SetActive(true);
+                errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
                EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
            }
            else {
                step1_2.GetComponent<Step1_2>().SafeFinish();
-
            }

        }
--- a/Assets/Scripts/Level1/Step1_2.cs
+++ b/Assets/Scripts/Level1/Step1_2.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using DG.Tweening;
+using Cinemachine;
 public class Step1_2 : MonoBehaviour
 {
    public Text tip;
@ -27,5 +28,8 @@ public class Step1_2 : MonoBehaviour
        tip.DOText("请用鼠标进行点击，保持周边环境空旷(提示周边物品和靠的太近的人)", 2);
        selectBt.SetActive(false);
        finishBt.gameObject.SetActive(true);
+        FindObjectOfType<CinemachineFreeLook>().m_Orbits[1].m_Radius = 3 ;
+        FindObjectOfType<CinemachineFreeLook>().Follow = GameObject.FindWithTag("TargetPos").transform;
+        FindObjectOfType<CinemachineFreeLook>().LookAt = GameObject.FindWithTag("TargetPos").transform;
    }
 }
--- a/Assets/Scripts/Level2/AniEnd.cs
+++ b/Assets/Scripts/Level2/AniEnd.cs
@ -7,6 +7,7 @@ public class AniEnd : MonoBehaviour
    public Text yishi;
    public GameObject yifu;
    Animator animator;
+    public GameObject errorTip;
    private void Awake()
    {
        animator = GetComponent<Animator>();
@ -30,6 +31,8 @@ public class AniEnd : MonoBehaviour

    public void E_GameEnd()
    {
+        errorTip.SetActive(true);
+        errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关", 60);
        EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
    }
 }
--- a/Assets/Tools/GameManager.cs
+++ b/Assets/Tools/GameManager.cs
@ -8,6 +8,7 @@ public class GameManager : MonoSingleton<GameManager>
    public GameObject person2;
    public GameObject[] needRemoveObjs;
    public GameObject[] needTransferObjs;
+    public GameObject errorTip;
    bool safe;
    public bool remove=false;
    public int safeOperate;//玩家选择的对应操作，0对应转移，1对应清理
@ -81,6 +82,8 @@ public class GameManager : MonoSingleton<GameManager>
        }
        GameObject obj2 = Instantiate(Resources.Load<GameObject>("operate"));
        obj2.GetComponent<Operate>().str = "2-将被救者转移到安全位置";
+        errorTip.SetActive(true);
+        errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
        EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
    }
 }