Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充协议

Browse Source
This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-06-27 17:23:21 +08:00
parent 825891b570
commit 8ea4149e9f
6 changed files with 280 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas
View File

@ -88,10 +88,52 @@ SpriteAtlas:
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- e2f0e310f699dd1499e93cb07a0a3198: 21300000
- 3b8788a5800321a4498485a85c170fc0: 21300000
- 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000
- c5d12f560ea2ef24b863f3329fe54030: 21300000
- e0932649c675784419f71913a849d5f2: 21300000
- 2cfbfa89505825949b3cec3b48d323a6: 21300000
- 9c5e0e9bd6ee88c4597788568c620662: 21300000
- 321bf3fcbdc862a46bc384367d7fbe90: 21300000
- 0f15acdd90c87fe47beedadca47e7010: 21300000
- d54d40edf100af147a5223de2f881ca3: 21300000
- fd93931e86ca40445a92b4f2074f37ac: 21300000
- af50fc7eee516a645b09aa8f79017aaa: 21300000
- 464e18bfd9c3d5e4b927c13ec9def492: 21300000
- d2ee8cbf34c48214688c60c2fadf0e8e: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3}
- {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
- {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3}
- {fileID: 21300000, guid: c5d12f560ea2ef24b863f3329fe54030, type: 3}
- {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3}
- {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3}
- {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3}
- {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
- {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
- {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
- {fileID: 21300000, guid: fd93931e86ca40445a92b4f2074f37ac, type: 3}
- {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
- {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3}
- {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3}
m_PackedSpriteNamesToIndex:
- xs_k
- MC
- DZ_icon
- jinshouzhi
- NL_box 2
- qz_jr
- NL_box_1
- gx
- LWTC_d_box
- TXK
- jinshoubi
- MC_jr
- NL_box
- NL_box 1
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u5F39\u7A97"
m_IsVariant: 0

26
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas
View File

@ -75,17 +75,33 @@ SpriteAtlas:
- {fileID: 21300000, guid: 221527fce6ae996489ca2c7e01d0d678, type: 3}
- {fileID: 21300000, guid: 9a8f35849df73bf4a8a841de4e70b699, type: 3}
- {fileID: 21300000, guid: d4c3de2ca85632b40b3e8d9884a94100, type: 3}
- {fileID: 21300000, guid: f28891cd97d1b1d4c995209dc870e427, type: 3}
- {fileID: 21300000, guid: c0d49da3c50e364499817c8cde4829b7, type: 3}
- {fileID: 21300000, guid: 7373de00561941343896c4e69e43436d, type: 3}
- {fileID: 21300000, guid: 260213ab1aa2dc34aa3f84761eb07316, type: 3}
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- 7373de00561941343896c4e69e43436d: 21300000
- 9a8f35849df73bf4a8a841de4e70b699: 21300000
- 260213ab1aa2dc34aa3f84761eb07316: 21300000
- d4c3de2ca85632b40b3e8d9884a94100: 21300000
- 221527fce6ae996489ca2c7e01d0d678: 21300000
- 6e5fddbf1f5ca3f4c80f68feeac293fa: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: 7373de00561941343896c4e69e43436d, type: 3}
- {fileID: 21300000, guid: 9a8f35849df73bf4a8a841de4e70b699, type: 3}
- {fileID: 21300000, guid: 260213ab1aa2dc34aa3f84761eb07316, type: 3}
- {fileID: 21300000, guid: d4c3de2ca85632b40b3e8d9884a94100, type: 3}
- {fileID: 21300000, guid: 221527fce6ae996489ca2c7e01d0d678, type: 3}
- {fileID: 21300000, guid: 6e5fddbf1f5ca3f4c80f68feeac293fa, type: 3}
m_PackedSpriteNamesToIndex:
- 1_7
- 1_3
- 1_8
- 1_6
- 1_2
- 1_1
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u6296\u97F3\u793C\u7269\u56FE_Dy"
m_IsVariant: 0

24
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas
View File

@ -80,10 +80,28 @@ SpriteAtlas:
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- 2b6f8d50ab114d448b03e8b7c279f230: 21300000
- e0246e23c99b19945b74857ab2afc817: 21300000
- 86ab5d2474d50d448a735fb340c904b4: 21300000
- 771e7d7731b51d74f99f46460198d153: 21300000
- 0a4f5c692f81d4d4f955f18051647cb9: 21300000
- 38a120ecc4a4c964fa5d4e7b77e63619: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: 2b6f8d50ab114d448b03e8b7c279f230, type: 3}
- {fileID: 21300000, guid: e0246e23c99b19945b74857ab2afc817, type: 3}
- {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3}
- {fileID: 21300000, guid: 771e7d7731b51d74f99f46460198d153, type: 3}
- {fileID: 21300000, guid: 0a4f5c692f81d4d4f955f18051647cb9, type: 3}
- {fileID: 21300000, guid: 38a120ecc4a4c964fa5d4e7b77e63619, type: 3}
m_PackedSpriteNamesToIndex:
- 61d19805a4d9deb2bed3110b3b57c82
- "\u53C2\u8003"
- zjm_tc_wmsp
- 7c55264c27b48fc5bd5eac56ef2c7e0
- "\u53C2\u8003\u56FE"
- zjm_wxwmjsq
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u65B0\u589E\u5185\u5BB9"
m_IsVariant: 0

78
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜_结算页面.spriteatlas
View File

@ -98,10 +98,82 @@ SpriteAtlas:
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- 004297c04262e1a4f8eb2d1518ae532b: 21300000
- a13cd031d50dca04d8d264c291083317: 21300000
- 76f9b341dbc47f84b99486db7ca567c5: 21300000
- 53e0e45115b6374448e9df6fcf9653c1: 21300000
- 728d13f1256766f44ad6d6b3f7aeea47: 21300000
- d2cf32534ae448c4c9ce21e2d6e1631f: 21300000
- cfcb6bf5266f8d94da65a08fac2238a5: 21300000
- 71580d3651f82514cb74ae33b540d664: 21300000
- 51bd67564af1c074983a6fad3d052c55: 21300000
- 3566d437a9a47334da152d1f5dd66fab: 21300000
- 0817ca5701cea81468b3fd7d94e37e97: 21300000
- 05c652979e70fd8469d5e9e572c5515d: 21300000
- 2cbb93a7d474ab240acaaf6589aae7be: 21300000
- b32855f7bb9a25a42a6f3991b2379e10: 21300000
- 6580d74a13a6e424e819e3b0a05de1ad: 21300000
- 69dd2b8a61fb40d4ba70c7a66fa2ec0c: 21300000
- 7f7a75ca6d490f74da4813ce6fe47c45: 21300000
- 448c239bec6e7e6409ca3e2ece8568d4: 21300000
- 922779bb63f355341a85c85f3d0a28d5: 21300000
- cba4c70c4650262459af9c0dfc7d8706: 21300000
- b2673f4cf0d66be429c88a9bd4f7cc5f: 21300000
- c7e7d7ed818d7ae42bdadeb0b42458cf: 21300000
- 3a9e308f2e9c1974b8666e9ae7e79fd3: 21300000
- b98c37ff06f2e784bb9382aacf39f87f: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: 004297c04262e1a4f8eb2d1518ae532b, type: 3}
- {fileID: 21300000, guid: a13cd031d50dca04d8d264c291083317, type: 3}
- {fileID: 21300000, guid: 76f9b341dbc47f84b99486db7ca567c5, type: 3}
- {fileID: 21300000, guid: 53e0e45115b6374448e9df6fcf9653c1, type: 3}
- {fileID: 21300000, guid: 728d13f1256766f44ad6d6b3f7aeea47, type: 3}
- {fileID: 21300000, guid: d2cf32534ae448c4c9ce21e2d6e1631f, type: 3}
- {fileID: 21300000, guid: cfcb6bf5266f8d94da65a08fac2238a5, type: 3}
- {fileID: 21300000, guid: 71580d3651f82514cb74ae33b540d664, type: 3}
- {fileID: 21300000, guid: 51bd67564af1c074983a6fad3d052c55, type: 3}
- {fileID: 21300000, guid: 3566d437a9a47334da152d1f5dd66fab, type: 3}
- {fileID: 21300000, guid: 0817ca5701cea81468b3fd7d94e37e97, type: 3}
- {fileID: 21300000, guid: 05c652979e70fd8469d5e9e572c5515d, type: 3}
- {fileID: 21300000, guid: 2cbb93a7d474ab240acaaf6589aae7be, type: 3}
- {fileID: 21300000, guid: b32855f7bb9a25a42a6f3991b2379e10, type: 3}
- {fileID: 21300000, guid: 6580d74a13a6e424e819e3b0a05de1ad, type: 3}
- {fileID: 21300000, guid: 69dd2b8a61fb40d4ba70c7a66fa2ec0c, type: 3}
- {fileID: 21300000, guid: 7f7a75ca6d490f74da4813ce6fe47c45, type: 3}
- {fileID: 21300000, guid: 448c239bec6e7e6409ca3e2ece8568d4, type: 3}
- {fileID: 21300000, guid: 922779bb63f355341a85c85f3d0a28d5, type: 3}
- {fileID: 21300000, guid: cba4c70c4650262459af9c0dfc7d8706, type: 3}
- {fileID: 21300000, guid: b2673f4cf0d66be429c88a9bd4f7cc5f, type: 3}
- {fileID: 21300000, guid: c7e7d7ed818d7ae42bdadeb0b42458cf, type: 3}
- {fileID: 21300000, guid: 3a9e308f2e9c1974b8666e9ae7e79fd3, type: 3}
- {fileID: 21300000, guid: b98c37ff06f2e784bb9382aacf39f87f, type: 3}
m_PackedSpriteNamesToIndex:
- dzzw_z
- zj_d
- SBYR_z
- JZ_tx_em
- zjgx_z
- zjgx_tx
- JZDS_icon
- QCZJ_z
- SBYR_EM
- dzzw_tx
- TZHS_tx_flash
- SL_box
- dik_box
- SBYR_z_flash
- JZ_tx
- zjgx_tx_flash
- TZHS_tx
- JZ_d
- 02a856d7ee75b85e3016c3e7351dbd0
- SL_em
- 4444
- SBYR_tx
- TZHS_z
- d7754d54ebc1a2b771406fffc15c723
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u7ED3\u7B97\u699C_\u7ED3\u7B97\u9875\u9762"
m_IsVariant: 0

3
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs
View File

@ -56,6 +56,9 @@ namespace GameLogic
public const string GetRank = "http://gapi.ganfanxiaozu.com/api/dm/avatar/rank";
public const string GetRankTest = "http://test-api.ganfanxiaozu.com/api/dm/avatar/rank";
public static string GetRoomInfo = "http://gapi.ganfanxiaozu.com/api/dm/getRoomInfo";
public static string GetAck = "http://gapi.ganfanxiaozu.com/api/dm/anchor/giftChat";
public static string GetAckTest = "http://test-api.ganfanxiaozu.com/api/dm/anchor/giftChat";
#endregion
public const string app_id = "tt891dffa01615adf510";
public const string app_id_test = "Dqzg001";

117
UnityProject/Assets/GameScripts/HotFix/GameLogic/ProtCust/ProtCust.cs
View File

@ -125,6 +125,11 @@ namespace GameLogic
OnHbTimer();
}
if (Input.GetKeyDown(KeyCode.Escape))
{
GetAck();
}
}
/// <summary>
@ -426,15 +431,101 @@ namespace GameLogic
}
}
private void SocketOnMessage(ParentProtCustMessageData data)
{
ParentProtCustMessageData json1 = data;
ProtCustMessageData protCustMessageData = new ProtCustMessageData();
if (json1.data == null)
{
return;
}
if (handled.ContainsKey(json1.data.msgId) == false)
{
handled[json1.data.msgId] = 1;
switch (json1.type)
{
case "MemberMessage":
break;
case "gift":
protCustMessageData.imgURL = json1.data.avatar;
protCustMessageData.nickName = json1.data.name;
protCustMessageData.content = json1.data.giftId;
protCustMessageData.Count = json1.data.repeatCount.ToString();
protCustMessageData.openId = string.IsNullOrEmpty(json1.data.uid) ? json1.data.openId : json1.data.uid;
protCustMessageData.giftValue = json1.data.giftValue;
protCustMessageData.rankRo = json1.data.rankRo;
protCustMessageData.customCamp = json1.data.customCamp;
protCustMessageData.roomId = json1.data.roomId;
// GameEvent.Send(EventConts.GiftInfo, protCustMessageData);
m_ListProCustMessageDatas[EventConts.GiftInfo].Add(protCustMessageData);
break;
case "like":
protCustMessageData.imgURL = json1.data.avatar;
protCustMessageData.nickName = json1.data.name;
protCustMessageData.content = "点赞";
protCustMessageData.Count = json1.data.likeCount;
protCustMessageData.openId = string.IsNullOrEmpty(json1.data.uid) ? json1.data.openId : json1.data.uid;
protCustMessageData.rankRo = json1.data.rankRo;
protCustMessageData.customCamp = json1.data.customCamp;
protCustMessageData.roomId = json1.data.roomId;
// GameEvent.Send(EventConts.LickInfo, protCustMessageData);
m_ListProCustMessageDatas[EventConts.LickInfo].Add(protCustMessageData);
break;
case "chat":
protCustMessageData.imgURL = json1.data.avatar;
protCustMessageData.nickName = json1.data.name;
protCustMessageData.content = json1.data.comment;
protCustMessageData.openId = string.IsNullOrEmpty(json1.data.uid) ? json1.data.openId : json1.data.uid;
protCustMessageData.rankRo = json1.data.rankRo;
protCustMessageData.customCamp = json1.data.customCamp;
protCustMessageData.roomId = json1.data.roomId;
// GameEvent.Send(EventConts.MessageInfo, protCustMessageData);
m_ListProCustMessageDatas[EventConts.MessageInfo].Add(protCustMessageData);
break;
}
}
// 礼物消息重发
if (json1.type == "chat" || json1.type == "gift")
{
#region 快手相关
Dictionary<string, string> dis = new Dictionary<string, string>();
dis.Add("type", "dmAck");
Dictionary<string, string> mdata = new Dictionary<string, string>();
mdata.Add("msgId", json1.data.msgId);
mdata.Add("ackType", "show");
dis.Add("data", mdata.ToJson());
m_WebSocket.SendAsync(dis.ToJson());
#endregion
}
}
private void SocketOnError(object o, ErrorEventArgs e)
{
Log.Error("Socket Error:" + e.Message.ToString());
UITip.ShowMessageBox("网络波动请尝试重连", MessageShowType.TwoButton, () =>
{
// socketIo.CloseAsync();
// socketIo = null;
// InitSelfServer();
m_WebSocket.CloseAsync();
m_WebSocket = null;
DySocketInit();
}, () =>
{
// Application.Quit();
@ -537,6 +628,28 @@ namespace GameLogic
m_WebSocket.SendAsync(content);
}
public void GetAck()
{
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("action", "list");
//dic.Add("roomId", EventConts.RoomData.room_id);
dic.Add("roomId", "11111");
string m_Json = HttpSendHelper.HttpPostRequest(EventConts.GetAckTest, dic.ToJson());
Log.Debug(m_Json);
// 先根据解析出来的类型处理
var mj = JObject.Parse(m_Json);
string Info = mj["data"].ToString();
List<ParentProtCustMessageData> json1 = JsonConvert.DeserializeObject<List<ParentProtCustMessageData>>(Info);
for (int i = 0; i < json1.Count; i++)
{
SocketOnMessage(json1[i]);
}
}
}