HEAD
2021744738 2 years ago
parent 63716fb326
commit 14d0ebdc17

@ -10,6 +10,37 @@ AnimatorState:
m_Name: New State
m_Speed: 1
m_CycleOffset: 0
<<<<<<<< HEAD:Assets/Mesh/AED03.controller
========
m_Transitions:
- {fileID: -1197639506692147403}
- {fileID: 2574766558205676741}
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:
--- !u!1102 &-3130435344861549618
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SanKai
m_Speed: 1
m_CycleOffset: 0
>>>>>>>> afcf818 (合):Assets/Mesh/NPC3.controller
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
@ -27,9 +58,40 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
<<<<<<<< HEAD:Assets/Mesh/AED03.controller
--- !u!1102 &-7448734751471410457
AnimatorState:
serializedVersion: 5
========
--- !u!1102 &-1914047247657973456
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: call
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 7400000, guid: ccb5c6615fc7fa14c8122e18ff39d4e1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1197639506692147403
AnimatorStateTransition:
>>>>>>>> afcf818 (合):Assets/Mesh/NPC3.controller
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -89,7 +151,23 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: AED03
serializedVersion: 5
<<<<<<<< HEAD:Assets/Mesh/AED03.controller
m_AnimatorParameters: []
========
m_AnimatorParameters:
- m_Name: Sankai
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Call
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
>>>>>>>> afcf818 (合):Assets/Mesh/NPC3.controller
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -103,9 +181,40 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
<<<<<<<< HEAD:Assets/Mesh/AED03.controller
--- !u!1107 &1172020540346056921
AnimatorStateMachine:
serializedVersion: 5
========
--- !u!1101 &2574766558205676741
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: Call
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1914047247657973456}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &4888383845834783892
AnimatorState:
serializedVersion: 6
>>>>>>>> afcf818 (合):Assets/Mesh/NPC3.controller
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -161,3 +270,37 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
<<<<<<<< HEAD:Assets/Mesh/AED03.controller
========
--- !u!1107 &7532277439809376808
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: -6884711862030136971}
m_Position: {x: 330, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 4888383845834783892}
m_Position: {x: 270, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -3130435344861549618}
m_Position: {x: 610, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -1914047247657973456}
m_Position: {x: 340, y: 0, 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: -6884711862030136971}
>>>>>>>> afcf818 (合):Assets/Mesh/NPC3.controller

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 14f21d7a1e53a8c4e87b25526a7eb63c
folderAsset: yes
timeCreated: 1466788345
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aadad8ac54f29e44583510294ac5c312
timeCreated: 1466788355
licenseType: Store
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,76 @@
fileFormatVersion: 2
guid: 6a3c684705042f345975d924f6983e36
timeCreated: 1466788352
licenseType: Store
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Android:
enabled: 1
settings:
CPU: AnyCPU
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
Linux:
enabled: 0
settings:
CPU: x86
Linux64:
enabled: 0
settings:
CPU: x86_64
OSXIntel:
enabled: 0
settings:
CPU: AnyCPU
OSXIntel64:
enabled: 0
settings:
CPU: AnyCPU
SamsungTV:
enabled: 1
settings:
STV_MODEL: STANDARD_13
Tizen:
enabled: 1
settings: {}
WebGL:
enabled: 1
settings: {}
Win:
enabled: 0
settings:
CPU: AnyCPU
Win64:
enabled: 0
settings:
CPU: AnyCPU
WindowsStoreApps:
enabled: 1
settings:
CPU: AnyCPU
DontProcess: False
PlaceholderPath: Assets/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll
SDK: AnySDK
ScriptingBackend: Il2Cpp
iOS:
enabled: 1
settings:
CompileFlags:
FrameworkDependencies:
tvOS:
enabled: 1
settings: {}
userData:
assetBundleName:
assetBundleVariant:

@ -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: 1.9784528}
m_LocalPosition: {x: 0, y: 0, z: 0}
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.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_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 &7156321317879884019
CanvasRenderer:
@ -61,7 +61,11 @@ 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:

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6d8487659eb88514b9ce9a69b7580cb1
guid: 685d7e505ac96994c82365156910a290
PrefabImporter:
externalObjects: {}
userData:

@ -1,6 +1,10 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
--- !u!1 &8292275344774832773
========
--- !u!1 &4499162084071578210
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,23 +12,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
- component: {fileID: 8292275344774832772}
- component: {fileID: 8292275344774832774}
- component: {fileID: 8292275344774832775}
m_Layer: 5
m_Name: hisitoryText
========
- component: {fileID: 4499162084071578213}
- component: {fileID: 4499162084071578215}
- component: {fileID: 4499162084071578212}
- component: {fileID: 4499162084071578214}
m_Layer: 5
m_Name: operate
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
--- !u!224 &8292275344774832772
========
--- !u!224 &4499162084071578213
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_GameObject: {fileID: 8292275344774832773}
========
m_GameObject: {fileID: 4499162084071578210}
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
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}
@ -32,26 +53,45 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 225.6, y: 42.73}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8292275344774832774
========
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -960, y: -540}
m_SizeDelta: {x: 300, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4499162084071578215
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_GameObject: {fileID: 8292275344774832773}
m_CullTransparentMesh: 0
--- !u!114 &8292275344774832775
========
m_GameObject: {fileID: 4499162084071578210}
m_CullTransparentMesh: 1
--- !u!114 &4499162084071578212
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_GameObject: {fileID: 8292275344774832773}
========
m_GameObject: {fileID: 4499162084071578210}
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@ -71,10 +111,31 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_Alignment: 0
========
m_Alignment: 3
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
<<<<<<<< HEAD:Assets/Resources/Prefab/hisitoryText.prefab
m_Text: d
========
m_Text:
--- !u!114 &4499162084071578214
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4499162084071578210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 802e6073d6cc2284287ab051e1780161, type: 3}
m_Name:
m_EditorClassIdentifier:
str:
>>>>>>>> afcf818 (合):Assets/Resources/operate.prefab

@ -0,0 +1,75 @@
fileFormatVersion: 2
guid: 17aef65a15b471f468b5fbeb4ff0c6a1
timeCreated: 1466788349
licenseType: Store
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Android:
enabled: 0
settings:
CPU: AnyCPU
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
Linux:
enabled: 1
settings:
CPU: x86
Linux64:
enabled: 1
settings:
CPU: x86_64
LinuxUniversal:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel64:
enabled: 1
settings:
CPU: AnyCPU
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
SamsungTV:
enabled: 0
settings:
STV_MODEL: STANDARD_13
Win:
enabled: 1
settings:
CPU: AnyCPU
Win64:
enabled: 1
settings:
CPU: AnyCPU
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
DontProcess: False
PlaceholderPath:
SDK: AnySDK
ScriptingBackend: Il2Cpp
iOS:
enabled: 0
settings:
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 87ac87713801eb7438f6a908ff3f968d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 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: Server
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: Android
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: iPhone
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -0,0 +1,20 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Area : MonoBehaviour
{
public Transform target;
void Start()
{
}
// Update is called once per frame
void Update()
{
if (target != null) {
this.GetComponent<RectTransform>().position = Camera.main.WorldToScreenPoint(target.position);
}
}
}

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

@ -0,0 +1,122 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using DG.Tweening;
public class Canvas : MonoBehaviour
{
int questionAnswer=-1;
public GameObject mask;
public GameObject tip;
public GameObject toolBag;
public GameObject errorTip;
public GameObject step1_1;
public GameObject step1_2;
public GameObject step2_1;
public GameObject moveTip;
public GameObject person1;
public GameObject person2;
private void Awake()
{
}
private void OnEnable()
{
}
private void Start()
{
EventManager.Instance.register("StartTip", StartTip);
EventManager.Instance.register("Step1_1", Step1_1);
EventManager.Instance.register("PanDuanSafe", SafeUIChange);
EventManager.Instance.register("SafeOperate", SafeOperate);
}
void StartTip(params object[] args) {
tip.SetActive(true);
}
void Step1_1(params object[] args) {
tip.SetActive(false);
toolBag.SetActive(true);
step1_1.SetActive(true);
}
public void Question(int value)
{
questionAnswer = value;
}
public void SunbmitOne() {
if (questionAnswer==0) {
Invoke("wait", 0.5f);
}
else
{
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前操作有误,请重试");
}
}
void wait() {
toolBag.SetActive(false);
person1.SetActive(false);
step1_2.SetActive(true);
}
public void FinishOperate() {
if (GameObject.FindGameObjectsWithTag("ZAW").Length == 0)
{
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"),GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "2-清理周边环境";
step1_2.SetActive(false);
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}
else {
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前环境还处于危险状态,请继续重试");
}
}
void SafeUIChange(params object[] data) {
if ((bool)data[0])
{
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "1-确认现场环境安全";
if ((bool)data[1])
{
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}
else {
step1_2.GetComponent<Step1_2>().SafeFinish();
}
}
else {
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前环境判断错误,请重新判断");
}
}
void SafeOperate(params object[] data) {
if ((int)data[0] == 0) {
mask.SetActive(true);
mask.GetComponent<Image>().DOColor(new Color(0, 0, 0, 1), 1);
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("正在转移");
Invoke("CloseMask", 3);
step1_2.SetActive(false);
} else if ((int)data[0] == 1) {
step1_2.GetComponent<Step1_2>().Remove();
}
}
void CloseMask() {
mask.GetComponent<Image>().DOColor(new Color(0, 0, 0, 0), 1);
mask.SetActive(false);
}
}

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using UnityEngine.UI;
public class ErrorTip : MonoBehaviour
{
Text text;
Image img;
float time;//³ÖÐøʱ³¤
private void Awake()
{
text = GetComponentInChildren<Text>();
img = GetComponentInChildren<Image>();
}
public void InitThis(string content,float t=2f) {
text.text = content;
time = t;
Invoke("CloseTip", time);
}
void CloseTip() {
transform.parent.gameObject.SetActive(false);
}
}

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

@ -0,0 +1,22 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GreenMan : MonoBehaviour
{
Animator animator;
public Transform safePos;
public Transform unSafePos;
private void Awake()
{
animator=GetComponent<Animator>();
}
public void SetPosBySafe(bool safe) {
transform.position = safe ? safePos.position : unSafePos.position;
}
public void E_GameEnd() {
EventManager.Instance.emit("GameEnd");
}
}

@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class Operate : MonoBehaviour
{
Text text;
public string str="";
void Start()
{
text = GetComponent<Text>();
transform.SetParent(GameObject.FindWithTag("Grid").transform);
}
private void Update()
{
text.text = str;
}
}

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

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using UnityEngine.UI;
public class ToolTip : MonoBehaviour
{
Text text;
private void OnEnable()
{
text = GetComponent<Text>();
//WaitClose();
Invoke("Close", 4);
}
void WaitClose()
{
text.DOColor(new Color(text.color.r, text.color.g, text.color.b, 0), 4);
}
void Close()
{
gameObject.SetActive(false);
}
}

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

@ -0,0 +1,35 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class AniEnd : MonoBehaviour
{
public Text yishi;
public GameObject yifu;
Animator animator;
private void Awake()
{
animator = GetComponent<Animator>();
}
public void E_HuhuanEnd()
{
EventManager.Instance.emit("NextAc");
yishi.text = "»èÃÔ";
}
public void E_GuanchaEnd(){
//yifu.SetActive(false);
EventManager.Instance.emit("ActionTwoEnd");
}
public void E_TuoyiEnd() {
EventManager.Instance.emit("guancha");
animator.SetTrigger("Guancha");
}
public void E_GameEnd()
{
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}
}

@ -0,0 +1,87 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using DG.Tweening;
public class Canvas2 : MonoBehaviour
{
public AudioClip[] ac;
AudioSource audioSource;
public GameObject tip2;
public GameObject step2_1;
public GameObject step2_2;
public Animator animator;
public GameObject errorTip;
public GameObject step2_3;
private void Start()
{
audioSource = GetComponent<AudioSource>();
EventManager.Instance.register("NextAc", NextAc);
EventManager.Instance.register("ActionTwoEnd", ActionTwoEnd);
EventManager.Instance.register("guancha",Guancha);
tip2.SetActive(true);
Invoke("InitLevel2", 3);
}
void InitLevel2()
{
tip2.GetComponentInChildren<Tip>().str = "请选择正确的部位进行拍打询问";
tip2.SetActive(false);
step2_1.SetActive(true);
tip2.SetActive(true);
}
void Guancha(params object[] data) {
audioSource.clip = ac[1];
audioSource.Play();
}
public void ActionOne(bool inspect) {
if (inspect)
{
step2_1.SetActive(false);
audioSource.clip = ac[0];
audioSource.Play();
animator.SetTrigger("Huhuan");
}
else {
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前拍打部位错误,请重试");
}
}
void NextAc(params object[] data) {
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "1-判断被救者有无意识";
tip2.GetComponentInChildren<Tip>().str = "请选择正确的部位进行观察";
tip2.SetActive(false);
tip2.SetActive(true);
step2_2.SetActive(true);
}
void ActionTwoEnd(params object[] data) {
step2_3.SetActive(true);
}
public void ActionTwo(bool inspect)
{
if (inspect)
{
step2_2.SetActive(false);
animator.SetTrigger("Tuoyi");
}
else
{
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("当前观察部位错误,请重试");
}
}
}

@ -0,0 +1,81 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class Step2_3 : MonoBehaviour
{
public Animator greenMan;
public Text State;
public static int rand;
int answer=-1;
public GameObject errorTip;
public GameObject tip;
private void Awake()
{
EventManager.Instance.register("Question2", Question2);
}
private void OnEnable()
{
Obstacle();
}
void Start()
{
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "2-观察被救者部位";
}
void Obstacle()
{
Debug.Log("随机结果");
rand = 10;
rand = Random.RandomRange(0, 2);
if (rand == 0)
{
State.text = "正常";
}
else if (rand == 1)
{
State.text = "不正常";
}
}
public void Question2(params object[] data) {
answer = (int)data[0];
}
public void PanDuan() {
if (rand == 0)
{
if (answer == 2)
{
greenMan.SetTrigger("Call");
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "3-请人拨打120";
tip.SetActive(false);
gameObject.SetActive(false);
}
else {
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("答案选择错误,请重试");
}
}
else if (rand == 1)
{
if (answer == 2)
{
greenMan.SetTrigger("Call");
GameObject obj = Instantiate(Resources.Load<GameObject>("operate"), GameObject.FindWithTag("Grid").transform);
obj.GetComponent<Operate>().str = "3-请人拨打120以及拿取AED";
tip.SetActive(false);
gameObject.SetActive(false);
}
else {
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("答案选择错误,请重试");
}
}
}
}

@ -0,0 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using UnityEngine.UI;
public class Tip : MonoBehaviour
{
public float time;
[TextArea]
public string str;
Text myText;
private void Awake()
{
myText = GetComponent<Text>();
}
private void OnEnable()
{
myText.text = "";
myText.DOText(str, time);
}
}

@ -0,0 +1,86 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
public class GameManager : MonoSingleton<GameManager>
{
public GameObject greenPerson;
public GameObject person2;
public GameObject[] needRemoveObjs;
public GameObject[] needTransferObjs;
bool safe;
public bool remove=false;
public int safeOperate;//玩家选择的对应操作0对应转移1对应清理
RaycastHit rh;
protected override void Awake()
{
base.Awake();
DontDestroyOnLoad(gameObject);
safe = Random.value > 0.5 ? true : false;
InitScene(safe);
}
private void Start()
{
}
private void Update()
{
if (remove) {
Ray ray=Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out rh)) {
if (rh.collider.tag == "ZAW" && Input.GetMouseButtonDown(0)) {
if (rh.collider.GetComponent<Animator>())
{
rh.collider.GetComponent<Animator>().SetTrigger("Sankai");
}
else {
rh.collider.gameObject.SetActive(false);
}
rh.collider.tag = "Untagged";
}
}
}
}
public void InitScene(bool safe) {
greenPerson.GetComponent<GreenMan>().SetPosBySafe(safe);
if (!safe)
{
foreach (GameObject obj in needRemoveObjs)
{
obj.SetActive(true);
}
greenPerson.tag = "ZAW";
}
}
public void PanDuanSafe(bool safe) {
EventManager.Instance.emit("PanDuanSafe", this.safe == safe,this.safe);
}
public void SetSafeOperate(int index) {
safeOperate = index;
if (index == 0) {
EventManager.Instance.emit("SafeOperate",0);
Invoke("TransferObjs", 1);
} else if (index==1) {
greenPerson.tag = "ZAW";
remove = true;
EventManager.Instance.emit("SafeOperate",1);
}
}
void TransferObjs() {
person2.SetActive(true);
FindObjectOfType<CinemachineFreeLook>().LookAt = needTransferObjs[0].transform;
FindObjectOfType<CinemachineFreeLook>().Follow = needTransferObjs[0].transform;
foreach (GameObject obj in needTransferObjs)
{
obj.transform.position += new Vector3(2, 0, -40);
}
GameObject obj2 = Instantiate(Resources.Load<GameObject>("operate"));
obj2.GetComponent<Operate>().str = "2-将被救者转移到安全位置";
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}
}

@ -1,6 +1,10 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
<<<<<<< HEAD
=======
"com.unity.cinemachine": "2.6.17",
>>>>>>> afcf818 ()
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.3",

@ -2,9 +2,22 @@
"dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
<<<<<<< HEAD
"depth": 0,
"source": "builtin",
"dependencies": {}
=======
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.cinemachine": {
"version": "2.6.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
>>>>>>> afcf818 ()
},
"com.unity.collab-proxy": {
"version": "1.2.16",

@ -4,5 +4,18 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
<<<<<<< HEAD
m_Scenes: []
=======
m_Scenes:
- enabled: 1
path: Assets/Scenes/Level1.unity
guid: 4233a03550fb9124db863528d6c65f60
- enabled: 1
path: Assets/Scenes/Level2.unity
guid: be9f593401d7c4647a1342851397a640
- enabled: 1
path: Assets/Scenes/AED03.unity
guid: 81868cf07d3a2254cae6615c4f2c50d5
>>>>>>> afcf818 (合)
m_configObjects: {}

Loading…
Cancel
Save