saipo/CangJie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

蜜汁Bug修

Browse Source
This commit is contained in:
Roman 2022-04-06 16:35:11 +08:00
parent 659b5f431f
commit 9db7e35f49
5 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Scenes/乐/Sample1.unity
View File

@ -273,7 +273,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 96574217}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 14.431048, y: -1.2, z: 0}
m_LocalPosition: {x: 26.052097, y: -1.2, z: 0}
m_LocalScale: {x: 0.8524737, y: 1.1058197, z: 0.9215932}
m_Children: []
m_Father: {fileID: 0}
@ -1133,7 +1133,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 447569230}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.9447613, y: -1.1173111, z: -10}
m_LocalPosition: {x: 50.16049, y: -1.0834508, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -1634,7 +1634,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 568882133}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 21.024761, y: -0.5, z: 0}
m_LocalPosition: {x: -37.08049, y: -0.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -1806,7 +1806,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 676515654}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 9.527619, y: -1.61, z: 0}
m_LocalPosition: {x: 38.580246, y: -1.61, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -2872,7 +2872,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1115045276}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.9447613, y: -2.1100001, z: 0}
m_LocalPosition: {x: 50.16049, y: -2.1100001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -4155,7 +4155,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867567306}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.9444447, y: -1.66, z: -10}
m_LocalPosition: {x: 60.915558, y: -1.96, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 927697135}
@ -9365,11 +9365,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
propertyPath: m_LocalPosition.x
value: -11.5
value: 57.36
objectReference: {fileID: 0}
- target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
propertyPath: m_LocalPosition.y
value: -1.66
value: -1.96
objectReference: {fileID: 0}
- target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
propertyPath: m_LocalPosition.z

4
Assets/Scripts/乐/Player.cs
View File

@ -90,6 +90,7 @@ public class Player : PlayerControl
//UPDATE
void Update()
{
TellMapStates();
//Debug.Log(weapon.name + " " + weapon.GetIsAtk());
//OnInputDetect();
@ -194,6 +195,9 @@ public class Player : PlayerControl
protected override void OnLeftChange()
{
//
Debug.Log("left");
//
ItemController.Instance.LeftChangeItem();
}

1
Assets/Scripts/乐/TransSense.cs
View File

@ -20,6 +20,7 @@ public class TransSense : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
FindObjectOfType<PlayerControl>().playerC.Dispose();
SceneManager.LoadSceneAsync(nextScene);
}
}

21
Assets/Scripts/勍/角色/PlayerControl.cs
View File

@ -9,7 +9,7 @@ using Sirenix.OdinInspector;
/// </summary>
public class PlayerControl : MonoBehaviour
{
private PlayerC playerC;
public PlayerC playerC;
/// <summary>
/// 此帧输入方向，-1为左，1为右，0此帧不输入
@ -56,6 +56,25 @@ public class PlayerControl : MonoBehaviour
Debug.LogError("玩家动画机丢失！");
}
//playerC.Dispose();
}
public void TellMapStates(){
if(playerC.Normal.enabled){
Debug.Log("Normal is Active");
}
else
{
Debug.Log("Normal is Inactive");
}
if(playerC.Null.enabled){
Debug.Log("Null is Active");
}
else
{
Debug.Log("Null is Inactive");
}
}
/// <summary>

6
UserSettings/EditorUserSettings.asset
View File

@ -15,16 +15,16 @@ EditorUserSettings:
value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d