Commit f1a4b0b7 authored by wanqing's avatar wanqing

修改bug

parent 0fa55877
......@@ -26,6 +26,7 @@ public class TargetTrigger : MonoBehaviour
{
m_bControl = false;
m_targetTrans = collider.transform;
rb.isKinematic = true;
rb.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionY | RigidbodyConstraints.FreezePositionZ |
RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY;
BattleCtrl.instance.OnBattleWin();
......
......@@ -12,11 +12,27 @@ public class ChainHandle : MonoBehaviour
public LevelEnum.MouseDirEnum MouseDir => m_mouseDir;
private Vector2 m_StartPos;
private Vector2 m_DragPos;
private Rigidbody m_rigidBody;//自身body
// Start is called before the first frame update
private void Awake()
{
m_rigidBody = gameObject.GetComponent<Rigidbody>();
//Lightmapping.giWorkflowMode = Lightmapping.GIWorkflowMode.Legacy;
}
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.CompareTag("Ball"))
{
m_rigidBody.isKinematic = true;
}
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.CompareTag("Ball"))
{
m_rigidBody.isKinematic = false;
}
}
private void Start()
{
GameServices.inputService.pad.onMoveVec3 += OnMove;
......
......@@ -11036,6 +11036,50 @@ MonoBehaviour:
m_obstract:
- {fileID: 4329161654649040698}
- {fileID: 1873194928220298181}
--- !u!1 &7034033198815306432
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7014086280781864021}
- component: {fileID: 8341903965564042425}
m_Layer: 13
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7014086280781864021
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7034033198815306432}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
m_Children: []
m_Father: {fileID: 6134826112617151598}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8341903965564042425
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7034033198815306432}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7881987973227064504
GameObject:
m_ObjectHideFlags: 0
......@@ -11180,7 +11224,7 @@ PrefabInstance:
- target: {fileID: 5063288112137550278, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_TagString
value: Player
value: Ball
objectReference: {fileID: 0}
- target: {fileID: 5063288112137550278, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
......@@ -11786,9 +11830,9 @@ PrefabInstance:
- {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
- {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
--- !u!4 &5939986232315155715 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
--- !u!54 &6134826114365119431 stripped
Rigidbody:
m_CorrespondingSourceObject: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 1398137262774903326}
m_PrefabAsset: {fileID: 0}
......@@ -11798,9 +11842,15 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1398137262774903326}
m_PrefabAsset: {fileID: 0}
--- !u!54 &6134826114365119431 stripped
Rigidbody:
m_CorrespondingSourceObject: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
--- !u!4 &6134826112617151598 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5063288112813874800, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 1398137262774903326}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5939986232315155715 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 1398137262774903326}
m_PrefabAsset: {fileID: 0}
......@@ -11883,18 +11933,18 @@ PrefabInstance:
objectReference: {fileID: 9000000, guid: 45d480461bbdc704587e117329ce8e69, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1e8e1924bb442334c9125455634bb567, type: 3}
--- !u!4 &2432369593384450469 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4749730850939948, guid: 1e8e1924bb442334c9125455634bb567,
type: 3}
m_PrefabInstance: {fileID: 2436830685248494985}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2437940273023101011 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1144978573833690, guid: 1e8e1924bb442334c9125455634bb567,
type: 3}
m_PrefabInstance: {fileID: 2436830685248494985}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2432369593384450469 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4749730850939948, guid: 1e8e1924bb442334c9125455634bb567,
type: 3}
m_PrefabInstance: {fileID: 2436830685248494985}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2637012148591201823
PrefabInstance:
m_ObjectHideFlags: 0
......
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