Commit 7d00b6d7 authored by 杨泽宇's avatar 杨泽宇

更新

parent db6168d0
......@@ -5,6 +5,7 @@ using UnityEngine;
public class CheckUINavigation : MonoBehaviour
{
private Camera mainCamera;
private void Start()
{
//获取主相机
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
value: {x: 5, y: -90, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -27,8 +27,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 20
value: {x: 0, y: 0, z: 0}
time: 35
value: {x: 5, y: -90, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -36,8 +36,17 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 25
value: {x: 0, y: 180, z: 0}
time: 40
value: {x: 5, y: 0, z: 0}
inSlope: {x: 0, y: 12, z: 0}
outSlope: {x: 0, y: 12, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 50
value: {x: 5, y: 90, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -54,7 +63,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -22.1, y: 2.17, z: 2.9}
value: {x: 27.75, y: 4, z: -20.28}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -62,8 +71,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 20
value: {x: 9.08, y: 2.17, z: 2.9}
time: 35
value: {x: -15.49, y: 4, z: -20.28}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -71,8 +80,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 25
value: {x: 9.08, y: 2.17, z: -8.94}
time: 50
value: {x: -15.49, y: 4, z: 13.84}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -80,8 +89,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 45
value: {x: -16.34, y: 2.17, z: -8.94}
time: 85
value: {x: 18.3, y: 4, z: 13.84}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -126,7 +135,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 45
m_StopTime: 85
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......@@ -148,7 +157,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -22.1
value: 27.75
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -156,8 +165,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
value: 9.08
time: 35
value: -15.49
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -165,8 +174,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
value: 9.08
time: 50
value: -15.49
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -174,8 +183,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 45
value: -16.34
time: 85
value: 18.3
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -196,7 +205,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 2.17
value: 4
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -204,8 +213,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
value: 2.17
time: 35
value: 4
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -213,8 +222,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
value: 2.17
time: 50
value: 4
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -222,8 +231,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 45
value: 2.17
time: 85
value: 4
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -244,7 +253,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 2.9
value: -20.28
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -252,8 +261,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
value: 2.9
time: 35
value: -20.28
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -261,8 +270,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
value: -8.94
time: 50
value: 13.84
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -270,8 +279,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 45
value: -8.94
time: 85
value: 13.84
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -292,7 +301,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -300,8 +309,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
value: 0
time: 35
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -309,8 +318,17 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
value: 0
time: 40
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 50
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -331,7 +349,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -339,8 +357,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
value: 0
time: 35
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -348,8 +366,17 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
value: 180
time: 40
value: 0
inSlope: 12
outSlope: 12
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 50
value: 90
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -378,7 +405,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 20
time: 35
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 40
value: 0
inSlope: 0
outSlope: 0
......@@ -387,7 +423,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 25
time: 50
value: 0
inSlope: 0
outSlope: 0
......
......@@ -11,7 +11,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8361141948799143229}
m_Position: {x: 320, y: 80, z: 0}
m_Position: {x: 350, y: 90, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......
......@@ -184,7 +184,9 @@ PrefabInstance:
propertyPath: m_text
value: "\u566A\u97F3"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 8044531072018400208, guid: 55794b7037fcf5a4d9df8e786c05fe52, type: 3}
- {fileID: 7436589325827107958, guid: 55794b7037fcf5a4d9df8e786c05fe52, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
......
......@@ -147,6 +147,7 @@ GameObject:
- component: {fileID: 8761526269984650321}
- component: {fileID: 3063552997852022502}
- component: {fileID: 1970156469123865433}
- component: {fileID: 1141199166970001408}
m_Layer: 5
m_Name: "\u6807\u7B7E-\u4F20\u611F\u5668\u6570\u636E-\u6E29\u5EA6"
m_TagString: Untagged
......@@ -239,6 +240,18 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &1141199166970001408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 353090738592438363}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3304861671137410752
GameObject:
m_ObjectHideFlags: 0
......@@ -480,9 +493,7 @@ GameObject:
m_Component:
- component: {fileID: 5207452559458023829}
- component: {fileID: 9143392636589211811}
- component: {fileID: 3264800303606210489}
- component: {fileID: 8634452630825987370}
- component: {fileID: 8714964122893740482}
m_Layer: 5
m_Name: "\u8BBE\u5907\u540D\u79F0"
m_TagString: Untagged
......@@ -518,18 +529,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6620959013802517021}
m_CullTransparentMesh: 1
--- !u!114 &3264800303606210489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6620959013802517021}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8634452630825987370
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -560,18 +559,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8714964122893740482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6620959013802517021}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7254163527434252992
GameObject:
m_ObjectHideFlags: 0
......@@ -735,7 +722,6 @@ GameObject:
- component: {fileID: 7436589325827107958}
- component: {fileID: 646826185693617563}
- component: {fileID: 795378899582384588}
- component: {fileID: 8044531072018400208}
m_Layer: 5
m_Name: "\u6570\u636E"
m_TagString: Untagged
......@@ -842,18 +828,6 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &8044531072018400208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8885326698556556983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9050781588650156339
GameObject:
m_ObjectHideFlags: 0
......
......@@ -777,6 +777,7 @@ GameObject:
- component: {fileID: 747468757413116974}
- component: {fileID: 5822978184787230767}
- component: {fileID: 5325766459964360639}
- component: {fileID: 7441132491348020860}
m_Layer: 5
m_Name: "\u6807\u7B7E-\u4F20\u611F\u5668\u6570\u636E-\u6E29\u5EA6\u4E0E\u6E7F\u5EA6"
m_TagString: Untagged
......@@ -867,6 +868,18 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &7441132491348020860
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6759971862549578609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6862114325736776465
GameObject:
m_ObjectHideFlags: 0
......@@ -1014,7 +1027,6 @@ GameObject:
- component: {fileID: 548004882016075922}
- component: {fileID: 2521278790737366145}
- component: {fileID: 9067593314910745643}
- component: {fileID: 2048122137823333192}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
......@@ -1107,15 +1119,3 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &2048122137823333192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8702787391663076042}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8be7e65bbf544647943ca46dbed4655, type: 3}
m_Name:
m_EditorClassIdentifier:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment