游戏内滤镜设置增加取消滤镜功能 #65
@ -32,6 +32,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7161016329433304235}
|
- {fileID: 7161016329433304235}
|
||||||
|
- {fileID: 5931284345598511}
|
||||||
- {fileID: 3567888507220032771}
|
- {fileID: 3567888507220032771}
|
||||||
m_Father: {fileID: 8635669497356860973}
|
m_Father: {fileID: 8635669497356860973}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -71,10 +72,10 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 120
|
m_Left: 20
|
||||||
m_Right: 100
|
m_Right: 20
|
||||||
m_Top: 80
|
m_Top: 20
|
||||||
m_Bottom: 80
|
m_Bottom: 20
|
||||||
m_ChildAlignment: 5
|
m_ChildAlignment: 5
|
||||||
m_Spacing: 0
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
@ -227,6 +228,102 @@ MonoBehaviour:
|
|||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Make XMB Great Again !
|
m_Text: Make XMB Great Again !
|
||||||
|
--- !u!1 &8254882995022780247
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5931284345598511}
|
||||||
|
- component: {fileID: 5412679746312716758}
|
||||||
|
- component: {fileID: 1280590479212552220}
|
||||||
|
- component: {fileID: 3616330448914434996}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5931284345598511
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8254882995022780247}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 3702320671699488055}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5412679746312716758
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8254882995022780247}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1280590479212552220
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8254882995022780247}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 85c3a144c43eab24bab8825879258327, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &3616330448914434996
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8254882995022780247}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_IgnoreLayout: 0
|
||||||
|
m_MinWidth: -1
|
||||||
|
m_MinHeight: -1
|
||||||
|
m_PreferredWidth: 80
|
||||||
|
m_PreferredHeight: 80
|
||||||
|
m_FlexibleWidth: -1
|
||||||
|
m_FlexibleHeight: -1
|
||||||
|
m_LayoutPriority: 1
|
||||||
--- !u!1 &8986536818905873058
|
--- !u!1 &8986536818905873058
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -306,14 +403,14 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.13207549, g: 0.13207549, b: 0.13207549, a: 1}
|
m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 0.6666667}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: b12ca21105df97a469be3cf97a4f5fc1, type: 3}
|
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -36,6 +36,10 @@
|
|||||||
OnRoomListSingleClose,//房间关闭
|
OnRoomListSingleClose,//房间关闭
|
||||||
OnRoomGetRoomScreen,//获取到房间数据
|
OnRoomGetRoomScreen,//获取到房间数据
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 我的房间创建成功
|
||||||
|
/// </summary>
|
||||||
|
OnMineRoomCreated,
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 我进入房间
|
/// 我进入房间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -269,6 +269,9 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
Protobuf_Room_Create_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_Room_Create_RESP>(reqData);
|
Protobuf_Room_Create_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_Room_Create_RESP>(reqData);
|
||||||
mineRoomMiniInfo = msg.RoomMiniInfo;
|
mineRoomMiniInfo = msg.RoomMiniInfo;
|
||||||
InitRePlay();
|
InitRePlay();
|
||||||
|
Eventer.Instance.PostEvent(EEvent.OnMineRoomCreated);
|
||||||
|
OverlayManager.PopTip($"房间创建成功");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -281,7 +284,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
{
|
{
|
||||||
_Protobuf_Room_Join.RoomID = RoomID;
|
_Protobuf_Room_Join.RoomID = RoomID;
|
||||||
_Protobuf_Room_Join.PlayerNum = JoinPlayerIdx;
|
_Protobuf_Room_Join.PlayerNum = JoinPlayerIdx;
|
||||||
App.log.Info($"创建房间");
|
App.log.Info($"加入房间");
|
||||||
App.network.SendToServer((int)CommandID.CmdRoomJoin, ProtoBufHelper.Serizlize(_Protobuf_Room_Join));
|
App.network.SendToServer((int)CommandID.CmdRoomJoin, ProtoBufHelper.Serizlize(_Protobuf_Room_Join));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -296,8 +299,8 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
mineRoomMiniInfo = msg.RoomMiniInfo;
|
mineRoomMiniInfo = msg.RoomMiniInfo;
|
||||||
InitRePlay();
|
InitRePlay();
|
||||||
{
|
{
|
||||||
OverlayManager.PopTip($"已进入[{msg.RoomMiniInfo.GetHostNickName()}]的房间");
|
|
||||||
Eventer.Instance.PostEvent(EEvent.OnMineJoinRoom);
|
Eventer.Instance.PostEvent(EEvent.OnMineJoinRoom);
|
||||||
|
OverlayManager.PopTip($"已进入[{msg.RoomMiniInfo.GetHostNickName()}]的房间");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -325,7 +328,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
ReleaseRePlay();
|
ReleaseRePlay();
|
||||||
mineRoomMiniInfo = null;
|
mineRoomMiniInfo = null;
|
||||||
Eventer.Instance.PostEvent(EEvent.OnMineLeavnRoom);
|
Eventer.Instance.PostEvent(EEvent.OnMineLeavnRoom);
|
||||||
OverlayManager.PopTip($"已经离开房间");
|
OverlayManager.PopTip($"你已经离开房间");
|
||||||
}
|
}
|
||||||
|
|
||||||
void RecvRoomMyRoomStateChange(byte[] reqData)
|
void RecvRoomMyRoomStateChange(byte[] reqData)
|
||||||
@ -344,14 +347,22 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
if (OldPlayer > 0)
|
if (OldPlayer > 0)
|
||||||
{
|
{
|
||||||
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer);
|
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer);
|
||||||
|
UserDataBase oldplayer = App.user.GetUserByUid(OldPlayer);
|
||||||
|
string oldPlayName = oldplayer != null ? oldplayer.NickName : "Player";
|
||||||
|
OverlayManager.PopTip($"[{oldPlayName}]离开房间,手柄位:P{i}");
|
||||||
if (NewPlayer > 0)//而且害换了一个玩家
|
if (NewPlayer > 0)//而且害换了一个玩家
|
||||||
{
|
{
|
||||||
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer);
|
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer);
|
||||||
OverlayManager.PopTip($"其他人进入了房间");
|
mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName);
|
||||||
|
OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else //之前没人
|
else //之前没人
|
||||||
|
{
|
||||||
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer);
|
Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer);
|
||||||
|
mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName);
|
||||||
|
OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -460,5 +471,25 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
freeSlots = temp.ToArray();
|
freeSlots = temp.ToArray();
|
||||||
return freeSlots.Length > 0;
|
return freeSlots.Length > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 按照房间玩家下标获取昵称
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="roomMiniInfo"></param>
|
||||||
|
/// <param name="PlayerIndex"></param>
|
||||||
|
/// <param name="PlayerName"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static bool GetPlayerNameByPlayerIdx(this Protobuf_Room_MiniInfo roomMiniInfo,uint PlayerIndex, out string PlayerName)
|
||||||
|
{
|
||||||
|
PlayerName = string.Empty;
|
||||||
|
switch (PlayerIndex)
|
||||||
|
{
|
||||||
|
case 0: PlayerName = roomMiniInfo.Player1UID > 0 ? roomMiniInfo.Player1NickName : null; break;
|
||||||
|
case 1: PlayerName = roomMiniInfo.Player2UID > 0 ? roomMiniInfo.Player2NickName : null; break;
|
||||||
|
case 2: PlayerName = roomMiniInfo.Player3UID > 0 ? roomMiniInfo.Player3NickName : null; break;
|
||||||
|
case 3: PlayerName = roomMiniInfo.Player4UID > 0 ? roomMiniInfo.Player4NickName : null; break;
|
||||||
|
}
|
||||||
|
return string.IsNullOrEmpty(PlayerName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -26,19 +26,17 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
RomID = RomID,
|
RomID = RomID,
|
||||||
PlatformType = Platform
|
PlatformType = Platform
|
||||||
};
|
};
|
||||||
|
|
||||||
App.log.Info($"LeavnRoom");
|
App.log.Info($"LeavnRoom");
|
||||||
App.network.SendToServer((int)CommandID.CmdGameMark, ProtoBufHelper.Serizlize(req));
|
App.network.SendToServer((int)CommandID.CmdGameMark, ProtoBufHelper.Serizlize(req));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 离开房间成功
|
/// 收藏
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="reqData"></param>
|
/// <param name="reqData"></param>
|
||||||
void RecvGameStar(byte[] reqData)
|
void RecvGameStar(byte[] reqData)
|
||||||
{
|
{
|
||||||
Protobuf_Game_Mark_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_Game_Mark_RESP>(reqData);
|
Protobuf_Game_Mark_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_Game_Mark_RESP>(reqData);
|
||||||
|
|
||||||
Eventer.Instance.PostEvent(EEvent.OnDoStars, msg.PlatformType, msg.RomID);
|
Eventer.Instance.PostEvent(EEvent.OnDoStars, msg.PlatformType, msg.RomID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user