p5uap9m7n
/
AED
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

结束提示

Browse Source
master
2021744738 2 years ago
parent b6038e3234
commit 68c6170429
13 changed files with 0 additions and 165 deletions
Show Stats Download Patch File Download Diff File

51
Assets/Mesh/NPC.controller
Unescape View File

@ -2,11 +2,7 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-9068569697077069658
AnimatorState:
<<<<<<< HEAD
serializedVersion: 5
=======
serializedVersion: 6
>>>>>>> 6dadace (游戏结束提示优化)
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -25,12 +21,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
<<<<<<< HEAD
m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc,
type: 3}
=======
m_Motion: {fileID: 1827226128182048838, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3}
>>>>>>> 6dadace (游戏结束提示优化)
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -38,11 +29,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &-7155772280476875541
AnimatorStateMachine:
<<<<<<< HEAD
serializedVersion: 5
=======
serializedVersion: 6
>>>>>>> 6dadace (游戏结束提示优化)
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -57,11 +44,7 @@ AnimatorStateMachine:
m_Position: {x: 110, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: -6531731146847969896}
<<<<<<< HEAD
m_Position: {x: 110, y: -120, z: 0}
=======
m_Position: {x: 440, y: 10, z: 0}
>>>>>>> 6dadace (游戏结束提示优化)
- serializedVersion: 1
m_State: {fileID: 7802149682489576577}
m_Position: {x: -39.964172, y: 316.8243, z: 0}
@ -70,22 +53,14 @@ AnimatorStateMachine:
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
<<<<<<< HEAD
m_AnyStatePosition: {x: -110, y: 30, z: 0}
=======
m_AnyStatePosition: {x: 50, y: 20, z: 0}
>>>>>>> 6dadace (游戏结束提示优化)
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:
<<<<<<< HEAD
serializedVersion: 5
=======
serializedVersion: 6
>>>>>>> 6dadace (游戏结束提示优化)
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -103,12 +78,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
<<<<<<< HEAD
m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc,
type: 3}
=======
m_Motion: {fileID: 7637981878267065282, guid: faad58a3df0562d44967a48bf3ae62dc, type: 3}
>>>>>>> 6dadace (游戏结束提示优化)
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -153,21 +123,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
<<<<<<< HEAD
m_Controller: {fileID: 9100000}
=======
m_Controller: {fileID: 0}
>>>>>>> 6dadace (游戏结束提示优化)
- m_Name: Squat
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
<<<<<<< HEAD
m_Controller: {fileID: 9100000}
=======
m_Controller: {fileID: 0}
>>>>>>> 6dadace (游戏结束提示优化)
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -183,11 +145,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &6136116136866434829
AnimatorState:
<<<<<<< HEAD
serializedVersion: 5
=======
serializedVersion: 6
>>>>>>> 6dadace (游戏结束提示优化)
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -240,11 +198,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &7802149682489576577
AnimatorState:
<<<<<<< HEAD
serializedVersion: 5
=======
serializedVersion: 6
>>>>>>> 6dadace (游戏结束提示优化)
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -262,12 +216,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
<<<<<<< HEAD
m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239,
type: 3}
=======
m_Motion: {fileID: 1827226128182048838, guid: edda6d24ad24efd4f8111b709188e239, type: 3}
>>>>>>> 6dadace (游戏结束提示优化)
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

14
Assets/Resources/operate.prefab
Unescape View File

@ -29,10 +29,6 @@ RectTransform:
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}
<<<<<<< HEAD
m_ConstrainProportionsScale: 0
=======
>>>>>>> 6dadace (游戏结束提示优化)
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -65,10 +61,6 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
<<<<<<< HEAD
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
=======
>>>>>>> 6dadace (游戏结束提示优化)
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -77,15 +69,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3}
m_FontSize: 25
m_FontStyle: 0
<<<<<<< HEAD
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
=======
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 25
>>>>>>> 6dadace (游戏结束提示优化)
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1

40
Assets/Scenes/Level1.unity
Unescape View File

@ -1176,11 +1176,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
m_BindingMode: 5
=======
m_BindingMode: 0
>>>>>>> 6dadace (游戏结束提示优化)
m_FollowOffset: {x: 0, y: 1.63, z: -5.1}
m_XDamping: 1
m_YDamping: 1
@ -5127,13 +5123,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 210506936}
<<<<<<< HEAD
m_LocalRotation: {x: -0.00096266397, y: 0.99067587, z: -0.13605641, w: -0.0070095025}
m_LocalPosition: {x: -40.797832, y: 3.896194, z: 149.5205}
=======
m_LocalRotation: {x: -0.0000000052348437, y: 0.99070066, z: -0.1360596, w: -0.00000003811685}
m_LocalPosition: {x: -40.87, y: 3.896194, z: 149.52101}
>>>>>>> 6dadace (游戏结束提示优化)
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -20427,11 +20418,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801163505}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: -40.797832, y: 3.896194, z: 149.5205}
=======
m_LocalPosition: {x: -40.87, y: 3.896194, z: 149.52101}
>>>>>>> 6dadace (游戏结束提示优化)
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1552527552}
@ -21544,11 +21531,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
m_BindingMode: 5
=======
m_BindingMode: 0
>>>>>>> 6dadace (游戏结束提示优化)
m_FollowOffset: {x: 0, y: 1.63, z: -5.1}
m_XDamping: 1
m_YDamping: 1
@ -23672,12 +23655,9 @@ MonoBehaviour:
needTransferObjs:
- {fileID: 219856779182228589}
- {fileID: 1965418836}
<<<<<<< HEAD
=======
- {fileID: 1944500207}
- {fileID: 820062967}
- {fileID: 1292127611}
>>>>>>> 6dadace (游戏结束提示优化)
errorTip: {fileID: 794437338}
remove: 0
safeOperate: 0
@ -28114,11 +28094,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 468386141}
m_HandleRect: {fileID: 468386140}
m_Direction: 2
<<<<<<< HEAD
m_Value: 0.99999964
=======
m_Value: 1.0000004
>>>>>>> 6dadace (游戏结束提示优化)
m_Size: 0.7244993
m_NumberOfSteps: 0
m_OnValueChanged:
@ -35201,11 +35177,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1419425040}
<<<<<<< HEAD
m_LocalRotation: {x: -0.0008353458, y: 0.9929811, z: -0.11806173, w: -0.007025837}
=======
m_LocalRotation: {x: 0.0000000020314623, y: 0.99300593, z: -0.118064456, w: 0.00000001708604}
>>>>>>> 6dadace (游戏结束提示优化)
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -38643,11 +38615,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1552527550}
<<<<<<< HEAD
m_LocalRotation: {x: -0.0010900075, y: 0.98803717, z: -0.15405379, w: -0.006990856}
=======
m_LocalRotation: {x: 5.4732193e-16, y: 0.9880619, z: -0.15405743, w: 3.510301e-15}
>>>>>>> 6dadace (游戏结束提示优化)
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -38871,11 +38839,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
m_BindingMode: 5
=======
m_BindingMode: 0
>>>>>>> 6dadace (游戏结束提示优化)
m_FollowOffset: {x: 0, y: 1.63, z: -5.1}
m_XDamping: 1
m_YDamping: 1
@ -40505,11 +40469,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644663018}
<<<<<<< HEAD
m_LocalRotation: {x: -0.0009626648, y: 0.99067587, z: -0.13605642, w: -0.007009509}
=======
m_LocalRotation: {x: -0.0000000026174218, y: 0.99070066, z: -0.1360596, w: -0.000000019058424}
>>>>>>> 6dadace (游戏结束提示优化)
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

31
Assets/Scenes/Level2.unity
Unescape View File

@ -4477,11 +4477,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 109739735}
m_Direction: 2
m_Value: 1
<<<<<<< HEAD
m_Size: 0.7244992
=======
m_Size: 0.7244993
>>>>>>> 6dadace (游戏结束提示优化)
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -15527,8 +15523,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 561483070}
m_CullTransparentMesh: 1
<<<<<<< HEAD
=======
--- !u!1 &565177946
GameObject:
m_ObjectHideFlags: 0
@ -15607,7 +15601,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 565177946}
m_CullTransparentMesh: 1
>>>>>>> 6dadace (游戏结束提示优化)
--- !u!1 &568831605
GameObject:
m_ObjectHideFlags: 0
@ -20182,10 +20175,7 @@ RectTransform:
- {fileID: 2094399789}
- {fileID: 1148684816}
- {fileID: 1148200631}
<<<<<<< HEAD
=======
- {fileID: 1225014652}
>>>>>>> 6dadace (游戏结束提示优化)
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -23271,15 +23261,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0c5580831ee54cd49a54e578647a809d, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
yishi: {fileID: 0}
yifu: {fileID: 0}
errorTip: {fileID: 0}
=======
yishi: {fileID: 224519137}
tip: {fileID: 1225014651}
errorTip: {fileID: 1148200630}
>>>>>>> 6dadace (游戏结束提示优化)
--- !u!1001 &881170073
PrefabInstance:
m_ObjectHideFlags: 0
@ -24231,11 +24215,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
<<<<<<< HEAD
m_Color: {r: 0.9811321, g: 0.03147021, b: 0.03147021, a: 1}
=======
m_Color: {r: 0, g: 0, b: 0, a: 1}
>>>>>>> 6dadace (游戏结束提示优化)
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -32082,8 +32062,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
<<<<<<< HEAD
=======
--- !u!1 &1225014651
GameObject:
m_ObjectHideFlags: 0
@ -32159,7 +32137,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1225014651}
m_CullTransparentMesh: 1
>>>>>>> 6dadace (游戏结束提示优化)
--- !u!1001 &1225543692
PrefabInstance:
m_ObjectHideFlags: 0
@ -49887,11 +49864,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 868723960}
m_HandleRect: {fileID: 868723959}
m_Direction: 0
<<<<<<< HEAD
m_Value: 1
=======
m_Value: 0
>>>>>>> 6dadace (游戏结束提示优化)
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -53555,11 +53528,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
yishi: {fileID: 224519137}
<<<<<<< HEAD
yifu: {fileID: 2059532709431411459}
=======
tip: {fileID: 0}
>>>>>>> 6dadace (游戏结束提示优化)
errorTip: {fileID: 1148200630}
--- !u!23 &628529072576343314
MeshRenderer:

4
Assets/Scripts/Level1.meta
Unescape View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 322a055d2a29c5346b096b7134d487f9
=======
guid: 6449c929ad0ae9e438d70a44587bd66a
>>>>>>> 6dadace (游戏结束提示优化)
folderAsset: yes
DefaultImporter:
externalObjects: {}

3
Assets/Scripts/Level1/Canvas.cs
Unescape View File

@ -76,11 +76,8 @@ public class Canvas : MonoBehaviour
step1_2.SetActive(false);
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
<<<<<<< HEAD
=======
GameEndTip.SetActive(true);
GameEndTip.GetComponentInChildren<Text>().text = "已经成功清理周边环境";
>>>>>>> 6dadace (游戏结束提示优化)
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}

4
Assets/Scripts/Level2.meta
Unescape View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 76ecc1afd5277334f8e2b25834d2aabf
=======
guid: b8adc2ec26ab6254eab2ae61b4e5ac9e
>>>>>>> 6dadace (游戏结束提示优化)
folderAsset: yes
DefaultImporter:
externalObjects: {}

3
Assets/Scripts/Level2/AniEnd.cs
Unescape View File

@ -31,10 +31,7 @@ public class AniEnd : MonoBehaviour
public void E_GameEnd()
{
<<<<<<< HEAD
=======
tip.SetActive(true);
>>>>>>> 6dadace (游戏结束提示优化)
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关", 60);
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);

4
Assets/Tools.meta
Unescape View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 9372cdb126e017d4399bd80ade0f4a23
=======
guid: 8638b60753c0f964691d4353263c7908
>>>>>>> 6dadace (游戏结束提示优化)
folderAsset: yes
DefaultImporter:
externalObjects: {}

5
Assets/Tools/GameManager.cs
Unescape View File

@ -87,10 +87,6 @@ public class GameManager : MonoSingleton<GameManager>
}
GameObject obj2 = Instantiate(Resources.Load<GameObject>("operate"));
obj2.GetComponent<Operate>().str = "2-将被救者转移到安全位置";
<<<<<<< HEAD
errorTip.SetActive(true);
errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关",60);
=======
Invoke("ZhuanyiEnd",2);
@ -101,7 +97,6 @@ public class GameManager : MonoSingleton<GameManager>
errorTip.GetComponentInChildren<ErrorTip>().InitThis("恭喜通关", 60);
GameEndTip.SetActive(true);
GameEndTip.GetComponentInChildren<Text>().text="已成功转移到安全位置";
>>>>>>> 6dadace (娓告垙缁撴潫鎻愮ず浼樺寲)
EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true);
}
}

3
Packages/manifest.json
Unescape View File

@ -1,9 +1,6 @@
{
"dependencies": {
<<<<<<< HEAD
=======
"com.unity.2d.sprite": "1.0.0",
>>>>>>> 6dadace (游戏结束提示优化)
"com.unity.cinemachine": "2.6.17",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",

3
Packages/packages-lock.json
Unescape View File

@ -1,14 +1,11 @@
{
"dependencies": {
<<<<<<< HEAD
=======
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
>>>>>>> 6dadace (游戏结束提示优化)
"com.unity.cinemachine": {
"version": "2.6.17",
"depth": 0,

BIN
ProjectSettings/EditorBuildSettings.asset
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save