wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TuJian

Browse Source
This commit is contained in:
wz1531
2026-04-29 01:18:39 +08:00
parent f8eadf4f74
commit 8c7e1ec302
158 changed files with 997254 additions and 61638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+44 -82
View File
@@ -2,6 +2,7 @@
using Assets.MyGame.Scripts.Net.API;
using Assets.MyGame.Scripts.Net.APIResponses.Enum;
using Assets.MyGame.Scripts.Net.WebResponses;
using DG.Tweening;
using Newtonsoft.Json;
using Spine.Unity;
using System;
@@ -25,10 +26,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
[Header("设置")]
protected bool isOpenSetting;
public Transform[] tra_SettingListPos;
public Transform[] tra_SettingListComponent;
public Button btn_SettingList;
public Transform SittingListParent;
[Header("我在这")]
public GameObject mySitAnim;
[Header("Skill")]
@@ -87,6 +86,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
public virtual void Start()
{
btn_SettingList.onClick.AddListener(() =>
{
if (isOpenSetting)
@@ -98,39 +98,29 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
StartCoroutine(OpenSettingList());
}
});
toggle_Lock.onValueChanged.AddListener((a) =>
{
if (!a)
if (toggle_Lock != null)
toggle_Lock.onValueChanged.AddListener((a) =>
{
if (!a)
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
frameType = FrameDataType.changeAutoTarget,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget
SyncGameData sgd = new SyncGameData
{
targetGuid = null,
}
};
sitPos = currSitData.posID,
frameType = FrameDataType.changeAutoTarget,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget
{
targetGuid = null,
}
};
WebSocketSendList.SyncGameData(sgd);
WebSocketSendList.SyncGameData(sgd);
}
}
}
});
foreach (var item in tra_SettingListComponent)
{
if (item.name == "Setting")
{
item.GetComponent<Button>().onClick.AddListener(() =>
{
UIManager.Instance.Close(UIPanel.MainGamePanelXJMH);
//等待界面添加
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelXJMH);
});
}
}
});
CreateFishManager.Instance.EnterRoom(gameType);
}
public void TuiChuHHWK()
@@ -372,59 +362,31 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
}
#region 打开关闭右上角设置选项
private IEnumerator OpenSettingList()
public virtual IEnumerator OpenSettingList()
{
tra_SettingListComponent[tra_SettingListComponent.Length - 1].localScale = Vector3.one + Vector3.left * 2;
RectTransform tran = SittingListParent.GetComponent<RectTransform>();
tran.gameObject.SetActive(true);
tran.DOSizeDelta(new Vector2(466, 143), 0.2f);
isOpenSetting = true;
int n = 0;
while (true)
{
if (isOpenSetting == false)
{
yield break;
}
yield return null;
for (int i = 0; i < tra_SettingListPos.Length; i++)
{
tra_SettingListComponent[i].position = Vector3.Lerp(tra_SettingListComponent[i].position, tra_SettingListPos[i].position, 0.5f);
if (tra_SettingListComponent[i].position == tra_SettingListPos[i].position)
{
n++;
if (n == tra_SettingListPos.Length)
{
yield break;
}
}
}
}
Vector3 v3 = btn_SettingList.transform.localScale;
v3.x = Mathf.Abs(v3.x) * -1;
btn_SettingList.transform.localScale = v3;
yield break;
}
private IEnumerator CloseSettingList()
public virtual IEnumerator CloseSettingList()
{
tra_SettingListComponent[tra_SettingListComponent.Length - 1].localScale = Vector3.one;
isOpenSetting = false;
int n = 0;
while (true)
RectTransform tran = SittingListParent.GetComponent<RectTransform>();
Vector3 v3 = btn_SettingList.transform.localScale;
v3.x = Mathf.Abs(v3.x);
btn_SettingList.transform.localScale = v3;
tran.DOSizeDelta(new Vector2(0, 143), 0.2f).OnComplete(() =>
{
if (isOpenSetting)
{
yield break;
}
yield return null;
for (int i = 0; i < tra_SettingListPos.Length; i++)
{
tra_SettingListComponent[i].position = Vector3.Lerp(tra_SettingListComponent[i].position, tra_SettingListPos[tra_SettingListPos.Length - 1].position, 0.5f);
if (tra_SettingListComponent[i].position == tra_SettingListPos[i].position)
{
n++;
if (n == tra_SettingListPos.Length)
{
yield break;
}
tran.gameObject.SetActive(false);
});
isOpenSetting = false;
}
}
}
yield break;
}
#endregion
private void SendBullet()
@@ -649,10 +611,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
public void SyncGameData_RendromDieFish(SyncGameData syncGameData)
{
var fireBullet = JsonConvert.DeserializeObject<FrameData_RandomDieFish>(syncGameData.frameData.ToString());
CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids, fireBullet.coinNum, new Vector3(fireBullet.x, fireBullet.y, fireBullet.z));
var fireBullet = JsonConvert.DeserializeObject<FrameData_RandomDieFish>(syncGameData.frameData.ToString());
CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids, fireBullet.coinNum, new Vector3(fireBullet.x, fireBullet.y, fireBullet.z));
}
@@ -660,7 +622,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
private async Task FireBullit(SitPosData sitPosData, float angle, bool isSanShe, bool auto, bool isSuoDing, bool twoRTruuect, bool isSelf = true)
{
//计算方向
Vector2 startV2;
@@ -724,7 +686,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
bulletMove.userid = roomJoinNotice.user;
bulletMove.playerID = roomJoinNotice.user;
bulletMove.bulletID = guid;
if (roomJoinNotice.skeletonAnimation!=null)
if (roomJoinNotice.skeletonAnimation != null)
{
roomJoinNotice.skeletonAnimation.AnimationState.SetAnimation(0, turretAttack, false);
}
@@ -756,7 +718,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
GameManager.Instance.gameData.roomJoinNotice = v.arguments[0];
isfirstShow = false;
currSitData = list_Sits[roomJoinNotice.position];
//currSitData.ChangeTurret(1);
currSitData.lockFX.transform.GetChild(0).gameObject.SetActive(false);