diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas index 05c805c7..f888c693 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas @@ -121,10 +121,151 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - e4908990e907ced44b86a625dabaa27f: 21300000 + - f56dc9b0b57169c47b65bf2403c8bf2e: 21300000 + - c14201f0f80ab264aaf08debeeec779e: 21300000 + - 8f433d11c6175fd47afb4f0e7be73dbd: 21300000 + - 78030231b2c6742438c2f67622ca1262: 21300000 + - e9e76581f169d5040ab2eaecb0263be8: 21300000 + - 5494df622d8fe1d46af0d456b5a3bcff: 21300000 + - 2e561772f31519b48a0ab15323747436: 21300000 + - 2ab004925fe05ea4189139d6634fc89c: 21300000 + - c23c25c21a0ab48448d8fbcd9846a1d6: 21300000 + - 684eeb03823cc3e49b6a5887bb31be70: 21300000 + - 70020d8362827f941ae2e250d3e10259: 21300000 + - 06e748b355806d3408600b9d9cd6a61e: 21300000 + - 3e973bb3aca50a6449a749680c2db168: 21300000 + - 66af95f3209b0f94f9361954481784e2: 21300000 + - a8f87634550bf8b40ba1fc4133eeecc3: 21300000 + - 98ee06a4f7f7e7e488584f6872038044: 21300000 + - 46934845d7fd2c143978d576382f49bf: 21300000 + - a21b8f45d1e48df47a6314b580422e3d: 21300000 + - b474057522933f44bb99a5141e4de92e: 21300000 + - 5bcf2eb5f17a97444ab3555c10d9a69f: 21300000 + - 6e658336532116a4db63aef49f6faef9: 21300000 + - b93ebe46c9fef6e44b88936aa9f06d1a: 21300000 + - f59bc6e6dc3b25b4889863bab125663b: 21300000 + - cd9dc1a764f3fa24593ccabe1b048983: 21300000 + - b8ba25f72aad3364c9cf90b708dcf73d: 21300000 + - d559bf28f7212cc48ac0d1a5b6a6949f: 21300000 + - ee26808848eb8da4e883cfceb4626125: 21300000 + - a7f80929c0671db4098dd6c85e15840a: 21300000 + - cfd2f569a0b350d41be563c8c0c3c8dc: 21300000 + - e4d38f79aca053c41808a2f8a98c2cf0: 21300000 + - 3d760d89198d8284e9b3901a6e13c27c: 21300000 + - f602b4f90c80ffb42b32186d8075f24d: 21300000 + - 7bb55d6ab10161a4e8ebf0033432909a: 21300000 + - 8d10d57a9612abc4d8186cdc0eb7647a: 21300000 + - 280312aa89342d240a9aae00ee6542b8: 21300000 + - 13c28b9bef016f149aa882bc73c50ce7: 21300000 + - 6ce9cf9bf19c0904db471d9c65874892: 21300000 + - 30f8a8fd10da84a42acb2d23aad7d118: 21300000 + - 516d8abe3c2c1bc42b6390c10af872bf: 21300000 + - 481fe1de817043646ad49730f16ffd48: 21300000 + - 522e3dde7cf719543b71871534ba6a67: 21300000 + - b0d2ceee9a5cb21449f8eadfe72a61cb: 21300000 + - 5bb6ac3fd15a1fc49a747143026a28ee: 21300000 + - 2d5c694fc8d2bed46996062763ed3b36: 21300000 + - dc1fef4f2611ecf4e88e5869cfbea019: 21300000 + - 438111afefc9e664287061861c1e98f1: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: e4908990e907ced44b86a625dabaa27f, type: 3} + - {fileID: 21300000, guid: f56dc9b0b57169c47b65bf2403c8bf2e, type: 3} + - {fileID: 21300000, guid: c14201f0f80ab264aaf08debeeec779e, type: 3} + - {fileID: 21300000, guid: 8f433d11c6175fd47afb4f0e7be73dbd, type: 3} + - {fileID: 21300000, guid: 78030231b2c6742438c2f67622ca1262, type: 3} + - {fileID: 21300000, guid: e9e76581f169d5040ab2eaecb0263be8, type: 3} + - {fileID: 21300000, guid: 5494df622d8fe1d46af0d456b5a3bcff, type: 3} + - {fileID: 21300000, guid: 2e561772f31519b48a0ab15323747436, type: 3} + - {fileID: 21300000, guid: 2ab004925fe05ea4189139d6634fc89c, type: 3} + - {fileID: 21300000, guid: c23c25c21a0ab48448d8fbcd9846a1d6, type: 3} + - {fileID: 21300000, guid: 684eeb03823cc3e49b6a5887bb31be70, type: 3} + - {fileID: 21300000, guid: 70020d8362827f941ae2e250d3e10259, type: 3} + - {fileID: 21300000, guid: 06e748b355806d3408600b9d9cd6a61e, type: 3} + - {fileID: 21300000, guid: 3e973bb3aca50a6449a749680c2db168, type: 3} + - {fileID: 21300000, guid: 66af95f3209b0f94f9361954481784e2, type: 3} + - {fileID: 21300000, guid: a8f87634550bf8b40ba1fc4133eeecc3, type: 3} + - {fileID: 21300000, guid: 98ee06a4f7f7e7e488584f6872038044, type: 3} + - {fileID: 21300000, guid: 46934845d7fd2c143978d576382f49bf, type: 3} + - {fileID: 21300000, guid: a21b8f45d1e48df47a6314b580422e3d, type: 3} + - {fileID: 21300000, guid: b474057522933f44bb99a5141e4de92e, type: 3} + - {fileID: 21300000, guid: 5bcf2eb5f17a97444ab3555c10d9a69f, type: 3} + - {fileID: 21300000, guid: 6e658336532116a4db63aef49f6faef9, type: 3} + - {fileID: 21300000, guid: b93ebe46c9fef6e44b88936aa9f06d1a, type: 3} + - {fileID: 21300000, guid: f59bc6e6dc3b25b4889863bab125663b, type: 3} + - {fileID: 21300000, guid: cd9dc1a764f3fa24593ccabe1b048983, type: 3} + - {fileID: 21300000, guid: b8ba25f72aad3364c9cf90b708dcf73d, type: 3} + - {fileID: 21300000, guid: d559bf28f7212cc48ac0d1a5b6a6949f, type: 3} + - {fileID: 21300000, guid: ee26808848eb8da4e883cfceb4626125, type: 3} + - {fileID: 21300000, guid: a7f80929c0671db4098dd6c85e15840a, type: 3} + - {fileID: 21300000, guid: cfd2f569a0b350d41be563c8c0c3c8dc, type: 3} + - {fileID: 21300000, guid: e4d38f79aca053c41808a2f8a98c2cf0, type: 3} + - {fileID: 21300000, guid: 3d760d89198d8284e9b3901a6e13c27c, type: 3} + - {fileID: 21300000, guid: f602b4f90c80ffb42b32186d8075f24d, type: 3} + - {fileID: 21300000, guid: 7bb55d6ab10161a4e8ebf0033432909a, type: 3} + - {fileID: 21300000, guid: 8d10d57a9612abc4d8186cdc0eb7647a, type: 3} + - {fileID: 21300000, guid: 280312aa89342d240a9aae00ee6542b8, type: 3} + - {fileID: 21300000, guid: 13c28b9bef016f149aa882bc73c50ce7, type: 3} + - {fileID: 21300000, guid: 6ce9cf9bf19c0904db471d9c65874892, type: 3} + - {fileID: 21300000, guid: 30f8a8fd10da84a42acb2d23aad7d118, type: 3} + - {fileID: 21300000, guid: 516d8abe3c2c1bc42b6390c10af872bf, type: 3} + - {fileID: 21300000, guid: 481fe1de817043646ad49730f16ffd48, type: 3} + - {fileID: 21300000, guid: 522e3dde7cf719543b71871534ba6a67, type: 3} + - {fileID: 21300000, guid: b0d2ceee9a5cb21449f8eadfe72a61cb, type: 3} + - {fileID: 21300000, guid: 5bb6ac3fd15a1fc49a747143026a28ee, type: 3} + - {fileID: 21300000, guid: 2d5c694fc8d2bed46996062763ed3b36, type: 3} + - {fileID: 21300000, guid: dc1fef4f2611ecf4e88e5869cfbea019, type: 3} + - {fileID: 21300000, guid: 438111afefc9e664287061861c1e98f1, type: 3} + m_PackedSpriteNamesToIndex: + - zjm_YS_DT5 + - zjm_YS_DT2 + - zjm_mz_3 + - zjm_gz_txzz_6 + - zjm_YS_DT9 + - ece6a1de44e637f8bf2d279015e2a72 + - zjm_mz_1 + - zjm_YS_DT7 + - zjm_jdt_1 + - zjm_YS_DT1 + - zjm_mz_7 + - zjm_gz_kk + - zjm_jdt_10 + - zjm_mz_5 + - zjm_mz_4 + - zjm_mz_6 + - zjm_LCJDT_lcd + - zjm_mz_8 + - zjm_jdt_8 + - zjm_mz_10 + - zjm_jdt_5 + - zjm_YS_X_BJ + - zjm_jdt_6 + - zjm_jdt_2 + - zjm_bt_sz + - zjm_xd_sjsj + - zjm_jdt_7 + - zjm_mz_2 + - zjm_gz_txkbzz + - zjm_mz_9 + - zjm_YS_DT8 + - zjm_jdt_9 + - zjm_1_BT + - zjm_LCJDT + - zjm_1_sjsj + - zjm_bt_zqdn + - zjm_cj_BJ + - zjm_jdt_4 + - zjm_YS_DT4 + - zjm_YS_DT10 + - zjm_YS_DT3 + - zjm_gz_txk + - zjm_jdt_3 + - zjm_YS_DT6 + - zjm_lwb_Old + - zjm_xx_BT + - zjm_bt_ph m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u4E3B\u754C\u9762" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab index 561dfb93..19c594dc 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab @@ -740,6 +740,7 @@ RectTransform: - {fileID: 4240183033384122430} - {fileID: 869193665477311054} - {fileID: 7005210993935573834} + - {fileID: 6135434651337117702} - {fileID: 7924596172304749232} - {fileID: 2669978239474154758} - {fileID: 6064446447331472796} @@ -772,6 +773,7 @@ MonoBehaviour: m_LoaclScore: {fileID: 6795924212604387844} m_WinCount: {fileID: 8169080446283399744} m_RankIndex: {fileID: 7943501947076435089} + m_RankIndex2: {fileID: 2633150227292201689} --- !u!114 &4487970101200929661 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1087,6 +1089,140 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!1 &2489228208616640869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6135434651337117702} + - component: {fileID: 718790719419670842} + - component: {fileID: 2633150227292201689} + m_Layer: 5 + m_Name: m_tmp_RankIndex + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6135434651337117702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489228208616640869} + 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: 826311576916127066} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -387, y: 0} + m_SizeDelta: {x: 144.4179, y: 44.5006} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &718790719419670842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489228208616640869} + m_CullTransparentMesh: 1 +--- !u!114 &2633150227292201689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489228208616640869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 47 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} + m_sharedMaterial: {fileID: -1876281447957755805, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30.3 + m_fontSizeBase: 30.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3491758741529285161 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs index 9834ac73..148c3e41 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs @@ -251,27 +251,22 @@ namespace GameLogic } else { - // // 增加点赞数量 - // data.m_LikeCount += int.Parse(protCustMessageData.Count); + // 增加点赞数量 + data.m_LikeCount += int.Parse(protCustMessageData.Count); - // var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId); + var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId); - // if (actor != null) - // { - // GiftConfig giftConfig = ConfigSystem.Instance.Tables.TbGiftConfig.Get(1); - // if (giftConfig == null) - // { - // Log.Error("礼物配置表Id异常 {0}", 1); - // return; - // } - // Log.Debug("点赞:" + data.teamId); - // DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data); - - // var a = GameModule.Resource.LoadAsset("Actor_Item"); - // var go = GameObject.Instantiate(a, null); - // go.gameObject.SetActive(false); - // go.GetComponent().OnInit(data.protCustMessageData.imgURL, actor); - // } + if (actor != null) + { + GiftConfig giftConfig = ConfigSystem.Instance.Tables.TbGiftConfig.Get(1); + if (giftConfig == null) + { + Log.Error("礼物配置表Id异常 {0}", 1); + return; + } + Log.Debug("点赞:" + data.teamId); + DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data); + } } } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 6b75ca10..74820d9c 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -342,7 +342,22 @@ namespace GameLogic // 整个Buff系统看看如何重构一下，部分礼物效果并不好实现 if (giftConfig.Id == 1) { + // 点赞 + var actor = GetTeamActor(unitPlayerData.teamId); + if (actor == null) + { + Log.Error("actor == null" + unitPlayerData.teamId); + return; + } + // 生成一个Buff添加.并没有特殊效果 + actor.AddBuff(new Buff() + { + m_Id = giftConfig.Id, + addPower = giftConfig.AddPower * num, + m_AllTimer = giftConfig.TimerLen, + m_CraeteTimer = Time.deltaTime, + }, unitPlayerData, giftConfig); } else if (giftConfig.Id == 2) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameRankItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameRankItem.cs index e79ebc40..f7e36f78 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameRankItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameRankItem.cs @@ -18,6 +18,7 @@ namespace GameLogic public TextMeshProUGUI m_LoaclScore; public TextMeshProUGUI m_WinCount; public TextMeshProUGUI m_RankIndex; + public TextMeshProUGUI m_RankIndex2; public void OnInit(int i, PlayRankData playRankData, UnitPlayerData unitPlayer) { @@ -29,6 +30,15 @@ namespace GameLogic { m_RankImg.sprite = GameModule.Resource.LoadAsset((i + 1).ToString() + "_d" + (i + 1).ToString()); m_Bg.sprite = GameModule.Resource.LoadAsset((i + 1).ToString() + "_d"); + m_RankIndex2.gameObject.SetActive(false); + m_RankImg.gameObject.SetActive(true); + } + else + { + m_RankImg.gameObject.SetActive(false); + m_Bg.sprite = GameModule.Resource.LoadAsset((4).ToString() + "_d"); + m_RankIndex2.text = (i + 1).ToString(); + m_RankIndex2.gameObject.SetActive(true); } m_WinCount.text = unitPlayer.m_GongXian.ToString();