修改了切换场景BUG
补上了老虎死亡时uI动画
This commit is contained in:
lspdC 2022-04-06 12:54:54 +08:00
parent 9dbb855441
commit 66545e8d88
8 changed files with 1102 additions and 6782 deletions

View File

@ -132,7 +132,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
propertyPath: m_RootOrder
value: 17
value: 16
objectReference: {fileID: 0}
- target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
propertyPath: m_LocalPosition.x
@ -180,17 +180,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: edecf791093330a4b8299512214e3c7b, type: 3}
--- !u!114 &28184874 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1020564151765312497, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
m_PrefabInstance: {fileID: 1020564151788253915}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 94a70686225bbcc40a44a76ac05951e0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &28184876 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
@ -277,7 +266,7 @@ Transform:
m_LocalScale: {x: 0.8524737, y: 1.1058197, z: 0.9215932}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 26
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &96574220
MonoBehaviour:
@ -351,7 +340,7 @@ Transform:
m_LocalScale: {x: 1.40125, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 33
m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &223863017
GameObject:
@ -460,7 +449,7 @@ Transform:
m_LocalScale: {x: 52.73806, y: 2.321, z: 2.321}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &278615300
GameObject:
@ -558,7 +547,7 @@ RectTransform:
- {fileID: 521191131}
- {fileID: 318831000}
m_Father: {fileID: 0}
m_RootOrder: 36
m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -705,7 +694,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &353254809
GameObject:
@ -903,7 +892,7 @@ Transform:
m_Children:
- {fileID: 1185727662}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &442489147
GameObject:
@ -1137,7 +1126,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 31
m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &521191130
GameObject:
@ -1342,7 +1331,7 @@ Transform:
m_LocalScale: {x: 55.699375, y: 2.321, z: 2.321}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &530194771
GameObject:
@ -1426,137 +1415,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &537498726
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 537498729}
- component: {fileID: 537498728}
- component: {fileID: 537498727}
- component: {fileID: 537498730}
- component: {fileID: 537498731}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!81 &537498727
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537498726}
m_Enabled: 1
--- !u!20 &537498728
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537498726}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 4.5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &537498729
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537498726}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &537498730
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537498726}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!114 &537498731
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537498726}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ff3269b294cb0488d44a4bc6fc6939, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 28184874}
--- !u!1 &568882133
GameObject:
m_ObjectHideFlags: 0
@ -1638,7 +1496,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 22
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &568882136
MonoBehaviour:
@ -1810,7 +1668,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 27
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &676515657
MonoBehaviour:
@ -1855,7 +1713,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &751536331
GameObject:
@ -1927,7 +1785,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &787274203
GameObject:
@ -1959,7 +1817,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &787274205
MonoBehaviour:
@ -2029,7 +1887,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 29
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &841324503
GameObject:
@ -2197,7 +2055,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3}
propertyPath: m_RootOrder
value: 16
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3}
propertyPath: m_LocalPosition.x
@ -2480,7 +2338,7 @@ Transform:
- {fileID: 841324504}
- {fileID: 1584969321}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1079202364
GameObject:
@ -2563,7 +2421,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 24
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1079202367
MonoBehaviour:
@ -2691,7 +2549,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 34
m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1110849468
GameObject:
@ -2876,7 +2734,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 28
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1115045279
MonoBehaviour:
@ -2924,7 +2782,7 @@ Transform:
- {fileID: 1346768666}
- {fileID: 1979334485}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1167537485
BoxCollider2D:
@ -3129,7 +2987,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3}
propertyPath: m_RootOrder
value: 18
value: 17
objectReference: {fileID: 0}
- target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3}
propertyPath: m_LocalPosition.x
@ -3424,7 +3282,7 @@ Transform:
m_Children:
- {fileID: 1327615879}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1381849287
MonoBehaviour:
@ -3672,7 +3530,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1566067912
GameObject:
@ -3702,7 +3560,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 21
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1567620583
GameObject:
@ -3768,7 +3626,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 37
m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1584969320
GameObject:
@ -3890,7 +3748,7 @@ Transform:
- {fileID: 1110849471}
- {fileID: 442489149}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1588872236
MonoBehaviour:
@ -4075,7 +3933,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 25
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1867567306
GameObject:
@ -4160,7 +4018,7 @@ Transform:
m_Children:
- {fileID: 927697135}
m_Father: {fileID: 0}
m_RootOrder: 32
m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1921855235
GameObject:
@ -4190,7 +4048,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 30
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1972708458
GameObject:
@ -9152,7 +9010,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2082496744
MonoBehaviour:
@ -9224,7 +9082,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 35
m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2089389211
MonoBehaviour:
@ -9268,7 +9126,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2140831766
GameObject:
@ -9361,7 +9219,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
propertyPath: m_LocalPosition.x
@ -9422,7 +9280,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1891403814086148855, guid: d806b9f1cc01ac345b486b12ec88394c, type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1891403814086148855, guid: d806b9f1cc01ac345b486b12ec88394c, type: 3}
propertyPath: m_LocalPosition.x
@ -9671,7 +9529,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3700592915405010629, guid: 725860ad24cfa2a46acd66ef8245968f, type: 3}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: 3700592915405010629, guid: 725860ad24cfa2a46acd66ef8245968f, type: 3}
propertyPath: m_LocalPosition.x
@ -9747,7 +9605,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3}
propertyPath: m_RootOrder
value: 19
value: 18
objectReference: {fileID: 0}
- target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3}
propertyPath: m_LocalPosition.x

File diff suppressed because it is too large Load Diff

View File

@ -14,6 +14,9 @@ public class ItemController : UnitySingleton<ItemController>
void Start()
{
Debug.Log("数组大小"+itemList.Count);
displayIndex = 0;
player = FindObjectOfType<Player>();
Display();
}
@ -21,7 +24,7 @@ public class ItemController : UnitySingleton<ItemController>
// Update is called once per frame
void Update()
{
Debug.Log("序号"+displayIndex);
}
//添加物品

View File

@ -126,6 +126,7 @@ public class Tiger : MonoBehaviour
Freeze();
anim.SetTrigger("老虎似了");
GetComponent<Collider2D>().enabled = false;
UIWord.Instance.TigerUI();
Debug.Log("老虎似了");
}
}

View File

@ -6,6 +6,7 @@ using UnityEngine.SceneManagement;
public class TransSense : MonoBehaviour
{
public string nextScene;
Player player;
// Start is called before the first frame update
void Start()
{
@ -20,6 +21,8 @@ public class TransSense : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
player = FindObjectOfType<Player>();
player.DisPose();
SceneManager.LoadSceneAsync(nextScene);
}
}

View File

@ -8,6 +8,7 @@ public class UIWord : UnitySingleton<UIWord>
public GameObject tree;
public GameObject fire;
public GameObject stone;
public GameObject tiger;
// Start is called before the first frame update
void Start()
{
@ -29,5 +30,8 @@ public class UIWord : UnitySingleton<UIWord>
public void StoneUI() {
stone.SetActive(true);
}
public void TigerUI()
{
tiger.SetActive(true);
}
}

View File

@ -22,6 +22,8 @@ public class PlayerControl : MonoBehaviour
protected virtual void Start()
{
playerC = new PlayerC();
//playerC.Enable();
playerC.Normal.Enable();
@ -56,6 +58,7 @@ public class PlayerControl : MonoBehaviour
Debug.LogError("玩家动画机丢失!");
}
}
/// <summary>
@ -166,4 +169,8 @@ public class PlayerControl : MonoBehaviour
yield return new WaitForSeconds(time);
ToMap("Normal");
}
public void DisPose() {
playerC.Dispose();
}
}

View File

@ -30,10 +30,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650