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

1

Browse Source
This commit is contained in:
wz1531
2026-03-09 09:25:01 +08:00
parent 3dd5a9bf4e
commit e39164fed4
113 changed files with 5154 additions and 3828 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
-145
View File
@@ -5699,7 +5699,6 @@ RectTransform:
- {fileID: 4559688230590463030}
- {fileID: 928710527401417714}
- {fileID: 678913131303693655}
- {fileID: 1101226416299028320}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -6189,147 +6188,3 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1001 &1690871251616316941
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3182697402847799673}
m_Modifications:
- target: {fileID: 1291800488841944919, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_Name
value: 1District
objectReference: {fileID: 0}
- target: {fileID: 1445048545826174922, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_SizeDelta.x
value: 582
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_SizeDelta.y
value: 1017
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3213656400481786378, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3213656400481786378, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7647910538216301643, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ad37004de2fb47f468b119a0b528ac78, type: 3}
--- !u!224 &1101226416299028320 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78,
type: 3}
m_PrefabInstance: {fileID: 1690871251616316941}
m_PrefabAsset: {fileID: 0}
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs
+13 -5
View File
@@ -50,10 +50,10 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
Hide();
});
panel_RoomItemPrefab.onClick.AddListener(() =>
{
GameManager.Instance.StartGame();
});
//panel_RoomItemPrefab.onClick.AddListener(() =>
//{
// GameManager.Instance.StartGame();
//});
}
private void Update()
{
@@ -67,7 +67,11 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
public override void Show(object args = null)
{
base.Show(args);
foreach (var item in itemPage)
{
Destroy(item.gameObject);
}
itemPage.Clear();
text_PageNum.text = pageNum + "/" + itemPage.Count;
panel_PanelParent.SetActive(false);
if (args != null)
@@ -91,6 +95,10 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
//itemListDic.Add Instantiate(panel_RoomItemPrefab, itemPage[(int)(i/15)-1]);
var tran = Instantiate(panel_RoomItemPrefab.gameObject, itemPage[(int)(i / 15)]).transform;
tran.GetComponent<Button>().onClick.AddListener(() =>
{
WebSocketSendList.GetRoomInfo(item.roomId);
});
tran.name = item.roomId;
itemListDic.Add(item.roomId, tran);
var slider = tran.transform.GetChild(1).GetComponent<Slider>();
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
+50 -11
View File
@@ -1,4 +1,5 @@
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.WebResponses;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -24,6 +25,7 @@ public class BG_SelectRoom
}
public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
{
[Header("DefaultGame")]
[Header("快速进入")]
public Button SelectRoom1;
@@ -38,50 +40,87 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
public List<BG_SelectRoom> bG_SelectRooms=new List<BG_SelectRoom>();
public Image img_BG;
int leave = 1;
public bool isMySelectRoom=false;
public override void Awake()
{
base.Awake();
WebSocketManager.Instance.Connect(SocketType.room);
MySelectRoom1.onClick.AddListener(() =>
{
OnSelectRoom(currGameType);
isMySelectRoom=true;
leave = 1;
OnSelectRoom(leave);
});
MySelectRoom2.onClick.AddListener(() =>
{
OnSelectRoom(currGameType);
isMySelectRoom = true;
leave = 2;
OnSelectRoom(leave);
});
MySelectRoom3.onClick.AddListener(() =>
{
OnSelectRoom(currGameType);
isMySelectRoom=true;
leave = 3;
OnSelectRoom(leave);
});
SelectRoom1.onClick.AddListener(() =>
{
StartGame(currGameType);
//StartGame(currGameType);
isMySelectRoom = false;
leave = 1;
OnSelectRoom(leave);
});
SelectRoom2.onClick.AddListener(() =>
{
StartGame(currGameType);
isMySelectRoom = false;
leave = 2;
OnSelectRoom(leave);
});
SelectRoom3.onClick.AddListener(() =>
{
StartGame(currGameType);
isMySelectRoom = false;
leave = 3;
OnSelectRoom(leave);
});
}
public void OnSelectRoom(object json)
public void OnSelectRoom(int leave)
{
WebSocketSendList.GetRoomListFish(1,1);
//这里有问题 玩的人多了就不能完了
WebSocketSendList.GetRoomListFish(leave, 1);
//WebSocketManager.Instance.Send(SocketType.room, "{\"type\":1,\"target\":\"GetRoomList\",\"invocationId\":\"1\",\"arguments\":[\""+GameManager.Instance.user.id+"\","+(int)GameManager.Instance.gameData.currGameType+","+leave+",1]}");
//这里想websocket发送链接请求
//panel_UIHome_BY_MySelectRoomPenel.Show(json);
}
public void StartGame(object o)
public static void StartGame(RoomChangeResponse o)
{
//这里写判断条件
GameManager.Instance.StartGame();
Dictionary<int,bool> keyValuePairs = new Dictionary<int,bool>();
for (int i = 0; i < o.maxPlayerCount; i++)
{
keyValuePairs.Add(i, true);
}
foreach (var item in o.players)
{
keyValuePairs[item.position] = false;
}
foreach(var item in keyValuePairs)
{
if (item.Value)
{
GameManager.Instance.StartGame(() =>
{
WebSocketSendList.JoinRoom(o.roomId, GameManager.Instance.user.id, item.Key);
});
break;
}
}
//这里写判断条件
}
public override void Show(object args = null)