Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改水

Browse Source
This commit is contained in:
BobSong
2026-01-01 22:00:33 +08:00
parent 040a222bd6
commit 9ceffccd39
1800 changed files with 103929 additions and 139495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiBoxShapeTracker2D.cs
View File

@@ -10,7 +10,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
BoxCollider2D box = collider as BoxCollider2D;
@@ -19,14 +19,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.Box;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = box.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = box.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
shape.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
shape.contactOffset = source.Thickness + box.edgeRadius;
shape.center = box.offset;
shape.size = box.size;
@@ -39,8 +37,9 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(box.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(box.transform, true);
world.colliderTransforms[index] = trfm;
return false;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiCapsuleShapeTracker2D.cs
View File

@@ -11,7 +11,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
CapsuleCollider2D capsule = collider as CapsuleCollider2D;
@@ -21,14 +21,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = capsule.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = capsule.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
shape.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
shape.contactOffset = source.Thickness;
shape.center = capsule.offset;
Vector2 size = capsule.size;
@@ -44,8 +42,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(capsule.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(capsule.transform,true);
world.colliderTransforms[index] = trfm;
return false;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiCircleShapeTracker2D.cs
View File

@@ -12,7 +12,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
CircleCollider2D sphere = collider as CircleCollider2D;
@@ -23,14 +23,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.Sphere;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = sphere.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = sphere.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
shape.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
shape.contactOffset = source.Thickness;
shape.center = sphere.offset;
shape.size = Vector3.one * sphere.radius;
@@ -43,8 +41,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(sphere.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(sphere.transform,true);
world.colliderTransforms[index] = trfm;
return true;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiEdgeShapeTracker2D.cs
View File

@@ -19,7 +19,7 @@ namespace Obi{
ObiColliderWorld.GetInstance().DestroyEdgeMesh(handle);
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
EdgeCollider2D edgeCollider = collider as EdgeCollider2D;
@@ -36,14 +36,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.EdgeMesh;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = edgeCollider.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = edgeCollider.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
shape.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
shape.center = edgeCollider.offset;
shape.contactOffset = source.Thickness + edgeCollider.edgeRadius;
shape.dataIndex = handle.index;
@@ -56,8 +54,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(edgeCollider.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(edgeCollider.transform, true);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()