Skip to content

Commit

Permalink
Merge pull request #83 from hhzzff/dev
Browse files Browse the repository at this point in the history 
style: 🎨 Fixed style problems.
  • Loading branch information
@asdawej
asdawej authored Jan 21, 2024
2 parents 5dc81c7 + 05d9a3f commit 5c6f344
Show file tree
Hide file tree
Showing 15 changed files with 11,537 additions and 9,158 deletions.
48 changes: 8 additions & 40 deletions interface/Assets/Scripts/Debugger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,14 @@ public class Debugger : MonoBehaviour
// Start is called before the first frame update
void Start()
{
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.CivilianShip),
new Vector3(0, 0),
Quaternion.identity,
GameObject.Find("Ship").transform,
0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.MilitaryShip),
new Vector3(5, 0),
Quaternion.identity,
GameObject.Find("Ship").transform,
0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.FlagShip),
new Vector3(10, 0),
Quaternion.identity,
GameObject.Find("Ship").transform,
0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ConstructionType.Fort),
new Vector3(15, -5),
Quaternion.identity,
GameObject.Find("Ship").transform,
0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.CivilianShip),
new Vector3(0, -5),
Quaternion.identity,
GameObject.Find("Ship").transform,
1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.MilitaryShip),
new Vector3(5, -5),
Quaternion.identity,
GameObject.Find("Ship").transform,
1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.FlagShip),
new Vector3(10, -5),
Quaternion.identity,
GameObject.Find("Ship").transform,
1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ConstructionType.Fort),
new Vector3(15, -5),
Quaternion.identity,
GameObject.Find("Ship").transform,
1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.CivilianShip), new Vector3(0, 0), Quaternion.identity, GameObject.Find("Ship").transform, 0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.MilitaryShip), new Vector3(5, 0), Quaternion.identity, GameObject.Find("Ship").transform, 0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.FlagShip), new Vector3(10, 0), Quaternion.identity, GameObject.Find("Ship").transform, 0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ConstructionType.Fort), new Vector3(15, -5), Quaternion.identity, GameObject.Find("Ship").transform, 0);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.CivilianShip), new Vector3(0, -5), Quaternion.identity, GameObject.Find("Ship").transform, 1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.MilitaryShip), new Vector3(5, -5), Quaternion.identity, GameObject.Find("Ship").transform, 1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ShipType.FlagShip), new Vector3(10, -5), Quaternion.identity, GameObject.Find("Ship").transform, 1);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(ConstructionType.Fort), new Vector3(15, -5), Quaternion.identity, GameObject.Find("Ship").transform, 1);
}

// Update is called once per frame
Expand Down
14 changes: 4 additions & 10 deletions interface/Assets/Scripts/Live/MessageReceiverLive.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,15 @@ private void Receive(MessageToClient message)
if (MessageManager.GetInstance().ShipG[messageOfObj.ShipMessage.Guid] == null)
{
MessageManager.GetInstance().ShipG[messageOfObj.ShipMessage.Guid] =
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(messageOfObj.ShipMessage.ShipType),
new Vector3(messageOfObj.ShipMessage.X, messageOfObj.ShipMessage.Y),
Quaternion.identity,
GameObject.Find("Ship").transform,
(int)messageOfObj.ShipMessage.TeamId);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(messageOfObj.ShipMessage.ShipType), new Vector3(messageOfObj.ShipMessage.X, messageOfObj.ShipMessage.Y), Quaternion.identity, GameObject.Find("Ship").transform, (int)messageOfObj.ShipMessage.TeamId);
MessageManager.GetInstance().Ship[messageOfObj.ShipMessage.Guid] = messageOfObj.ShipMessage;
}
break;
case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
if (MessageManager.GetInstance().BulletG[messageOfObj.BulletMessage.Guid] == null)
{
MessageManager.GetInstance().BulletG[messageOfObj.BulletMessage.Guid] =
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(messageOfObj.BulletMessage.Type),
new Vector3(messageOfObj.BulletMessage.X, messageOfObj.BulletMessage.Y),
Quaternion.identity,
GameObject.Find("Bullet").transform);
ObjectCreater.GetInstance().CreateObject(ParaDefine.GetInstance().PT(messageOfObj.BulletMessage.Type), new Vector3(messageOfObj.BulletMessage.X, messageOfObj.BulletMessage.Y), Quaternion.identity, GameObject.Find("Bullet").transform);
MessageManager.GetInstance().Bullet[messageOfObj.BulletMessage.Guid] = messageOfObj.BulletMessage;
}
break;
Expand All @@ -94,7 +87,8 @@ private void Receive(MessageToClient message)
break;
case MessageOfObj.MessageOfObjOneofCase.ResourceMessage:
break;
default: break;
default:
break;
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions interface/Assets/Scripts/Manager/MapControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ public void DrawMap(MessageOfMap map)
ParaDefine.GetInstance().PT(PlaceType.Space),
ParaDefine.GetInstance().CellToMap(i, j),
Quaternion.identity,
mapFa.transform);
mapFa.transform
);
ObjectCreater.GetInstance().CreateObject(
ParaDefine.GetInstance().PT(map.Rows[i].Cols[j]),
ParaDefine.GetInstance().CellToMap(i, j),
Quaternion.identity,
mapFa.transform);
mapFa.transform
);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion interface/Assets/Scripts/Manager/ObjectCreater.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ public class ObjectCreater : SingletonMono<ObjectCreater>
public GameObject CreateObject(GameObject targetG, Vector2 position, Quaternion quaternion, Transform targetPa, int teamKey = 0)
{
GameObject obj = Instantiate(targetG, position, quaternion, targetPa);
if (targetG.transform.childCount == 0) return obj;
if (targetG.transform.childCount == 0)
return obj;
Debug.Log("step1");
RendererControl.GetInstance().SetColToChild(teamKey, obj.transform);
Debug.Log("step3");
Expand Down
3 changes: 2 additions & 1 deletion interface/Assets/Scripts/Manager/RendererControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public void SetColToChild(int teamKey, Transform targetTransform)
CurrentPropertyBlock.SetColor("_GlowColor", Team1Color.Item2);
CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock);
return;
default: return;
default:
return;
}
}
}
12 changes: 8 additions & 4 deletions interface/Assets/Scripts/ParaDefine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public GameObject PT(PlaceType _placeType, int teamKey = 0)
return resourceG[GetRand() % 3];
case PlaceType.Wormhole:
return wormholeG;
default: return null;
default:
return null;
}
}
public GameObject PT(ConstructionType _constructionType, int teamKey = 0)
Expand All @@ -54,7 +55,8 @@ public GameObject PT(ConstructionType _constructionType, int teamKey = 0)
return factoryG[teamKey];
case ConstructionType.Fort:
return fortG;
default: return null;
default:
return null;
}
}
public GameObject PT(ShipType _shipType, int teamKey = 0)
Expand All @@ -67,7 +69,8 @@ public GameObject PT(ShipType _shipType, int teamKey = 0)
return militaryshipG;
case ShipType.FlagShip:
return flagshipG;
default: return null;
default:
return null;
}
}
public GameObject PT(BulletType _bulletType, int teamKey = 0)
Expand All @@ -84,7 +87,8 @@ public GameObject PT(BulletType _bulletType, int teamKey = 0)
return missileG[teamKey];
case BulletType.Arc:
return arcG[teamKey];
default: return null;
default:
return null;
}
}
public Vector3 CellToMap(int x, int y)
Expand Down
13 changes: 4 additions & 9 deletions interface/Assets/Scripts/Play/MessageReceiverPlay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,15 @@ private void Receive(MessageToClient message)
if (MessageManager.GetInstance().ShipG[messageOfObj.ShipMessage.Guid] == null)
{
MessageManager.GetInstance().ShipG[messageOfObj.ShipMessage.Guid] =
Instantiate(ParaDefine.GetInstance().PT(messageOfObj.ShipMessage.ShipType),
new Vector3(messageOfObj.ShipMessage.X, messageOfObj.ShipMessage.Y),
Quaternion.identity,
GameObject.Find("Ship").transform);
Instantiate(ParaDefine.GetInstance().PT(messageOfObj.ShipMessage.ShipType), new Vector3(messageOfObj.ShipMessage.X, messageOfObj.ShipMessage.Y), Quaternion.identity, GameObject.Find("Ship").transform);
MessageManager.GetInstance().Ship[messageOfObj.ShipMessage.Guid] = messageOfObj.ShipMessage;
}
break;
case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
if (MessageManager.GetInstance().BulletG[messageOfObj.BulletMessage.Guid] == null)
{
MessageManager.GetInstance().BulletG[messageOfObj.BulletMessage.Guid] =
Instantiate(ParaDefine.GetInstance().PT(messageOfObj.BulletMessage.Type),
new Vector3(messageOfObj.BulletMessage.X, messageOfObj.BulletMessage.Y),
Quaternion.identity,
GameObject.Find("Bullet").transform);
Instantiate(ParaDefine.GetInstance().PT(messageOfObj.BulletMessage.Type), new Vector3(messageOfObj.BulletMessage.X, messageOfObj.BulletMessage.Y), Quaternion.identity, GameObject.Find("Bullet").transform);
MessageManager.GetInstance().Bullet[messageOfObj.BulletMessage.Guid] = messageOfObj.BulletMessage;
}
break;
Expand All @@ -123,7 +117,8 @@ private void Receive(MessageToClient message)
break;
case MessageOfObj.MessageOfObjOneofCase.ResourceMessage:
break;
default: break;
default:
break;
}
}
}
Expand Down
Loading

0 comments on commit 5c6f344

Please sign in to comment.