diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_事件进度.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_事件进度.spriteatlas index de3226cb..c0429b36 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_事件进度.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_事件进度.spriteatlas @@ -80,10 +80,28 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - aaf0a90038f767a4498ed42ce45bbaa2: 21300000 + - ddc607e4432dd814395b54f7b1201de4: 21300000 + - db4db7e51f12bd645bd114e1f0af26ea: 21300000 + - dee85966fc3dbd448a3f9979b75072d9: 21300000 + - 08cc5ee6f40805f4180c0771351a0aeb: 21300000 + - 2c72d5ed465fd234ebed90d49dfbb653: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: aaf0a90038f767a4498ed42ce45bbaa2, type: 3} + - {fileID: 21300000, guid: ddc607e4432dd814395b54f7b1201de4, type: 3} + - {fileID: 21300000, guid: db4db7e51f12bd645bd114e1f0af26ea, type: 3} + - {fileID: 21300000, guid: dee85966fc3dbd448a3f9979b75072d9, type: 3} + - {fileID: 21300000, guid: 08cc5ee6f40805f4180c0771351a0aeb, type: 3} + - {fileID: 21300000, guid: 2c72d5ed465fd234ebed90d49dfbb653, type: 3} + m_PackedSpriteNamesToIndex: + - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3" + - SB + - CG + - JD_D_box + - JD_box + - LSsj m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u4E8B\u4EF6\u8FDB\u5EA6" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas index 8d1326c4..09841af2 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas @@ -85,13 +85,11 @@ SpriteAtlas: - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3} - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3} - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3} - - {fileID: 21300000, guid: a8460773c27a29748bbadcdc333e57aa, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} packedSpriteRenderDataKeys: - e2f0e310f699dd1499e93cb07a0a3198: 21300000 - - a8460773c27a29748bbadcdc333e57aa: 21300000 - 3b8788a5800321a4498485a85c170fc0: 21300000 - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000 - e7f5460757eef7c409168510aa3c5037: 21300000 @@ -108,7 +106,6 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3} - - {fileID: 21300000, guid: a8460773c27a29748bbadcdc333e57aa, type: 3} - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3} - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3} - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3} @@ -124,7 +121,6 @@ SpriteAtlas: - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3} m_PackedSpriteNamesToIndex: - xs_k - - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3" - MC - DZ_icon - GJSK diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab index 3705b7bc..6fbf7b2c 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab @@ -784,7 +784,7 @@ GameObject: - component: {fileID: 7080048567210482811} - component: {fileID: 4126445047750826706} m_Layer: 5 - m_Name: m_tmp_PlayerName (2) + m_Name: m_tmp_ShenDuValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -979,6 +979,7 @@ GameObject: m_Component: - component: {fileID: 6354543368462958376} - component: {fileID: 8725143268810197699} + - component: {fileID: 25994427755045404} m_Layer: 5 m_Name: m_itemRankItemJiaZu m_TagString: Untagged @@ -1006,6 +1007,7 @@ RectTransform: - {fileID: 7855661659312902368} - {fileID: 9169622300685960657} - {fileID: 7296708289919807870} + - {fileID: 4103842296556738823} - {fileID: 1099424172038461835} - {fileID: 2624021824969406910} m_Father: {fileID: 4486374095809352920} @@ -1028,6 +1030,28 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Padding: 0 +--- !u!114 &25994427755045404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278574392160101273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8754f018cbc92489a45a44b67754ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_KuaiSuRect: {fileID: 6481773459769904457} + m_ZhengChangRect: {fileID: 6615650786298566649} + m_ShenDuRect: {fileID: 3876095348166231963} + m_KuaiSuValue: {fileID: 1397582200003972047} + m_ZhengChangValue: {fileID: 6556225433848069655} + m_ShenDuValue: {fileID: 4126445047750826706} + m_RankIndex: {fileID: 8248612633869791436} + m_RankIndexText: {fileID: 251758745345865911} + m_TeamName: {fileID: 571890581702974147} + m_Score: {fileID: 895130500527971784} --- !u!1 &1325409573337551025 GameObject: m_ObjectHideFlags: 0 @@ -1190,7 +1214,7 @@ GameObject: - component: {fileID: 3000188199444177435} - component: {fileID: 1397582200003972047} m_Layer: 5 - m_Name: m_tmp_PlayerName + m_Name: m_tmp_KuaiSuValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1567,7 +1591,7 @@ GameObject: - component: {fileID: 8802647777935505738} - component: {fileID: 6556225433848069655} m_Layer: 5 - m_Name: m_tmp_PlayerName (1) + m_Name: m_tmp_ZehngChangValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1818,7 +1842,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowSwitchOff: 1 + m_AllowSwitchOff: 0 --- !u!1 &2353629731165882798 GameObject: m_ObjectHideFlags: 0 @@ -2648,6 +2672,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3522869144998095044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4103842296556738823} + - component: {fileID: 8161905111897858576} + - component: {fileID: 251758745345865911} + m_Layer: 5 + m_Name: m_tmp_RankIndex + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4103842296556738823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3522869144998095044} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6354543368462958376} + 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: -357.23, y: 135.01} + m_SizeDelta: {x: 73.112, y: 64.542} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8161905111897858576 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3522869144998095044} + m_CullTransparentMesh: 1 +--- !u!114 &251758745345865911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3522869144998095044} + 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: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, 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: 36 + m_fontSizeBase: 36 + 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: 0 + 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 &3524672270316861785 GameObject: m_ObjectHideFlags: 0 @@ -3387,7 +3545,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4202663689775488369} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png deleted file mode 100644 index 63979949..00000000 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png and /dev/null differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png.meta deleted file mode 100644 index f5c0419e..00000000 --- a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/弹窗/主界面—现代.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: a8460773c27a29748bbadcdc333e57aa -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs index 9ad66467..2f6a0d82 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using GameConfig.actorConfig; using TEngine; using Unity.Mathematics; +using UnityEditor.Experimental.GraphView; using UnityEngine; namespace GameLogic @@ -327,4 +328,27 @@ namespace GameLogic public int code; public RoomInfoData data; } + + public class GetJiaZuData + { + public string property; + public string type; + public int top; + } + + public class JiaZuRankDataRoot + { + public int code; + public string msg; + public List data; + } + + + public class JiaZuData + { + public string name; + public long score; + } + + } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs index 2371c74c..60b27088 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs @@ -247,46 +247,51 @@ public class DataGameModelManager : GameBase.Singleton // 家族 - //public async Task> C2S_GetJiaZuRank() - //{ - - // Dictionary testDic = new Dictionary(); - // testDic.Add("p", 100); - // testDic.Add("type", type); + public async Task> C2S_GetJiaZuRank() + { - // string url = EventConts.PlatformType == PlatformType.None ? EventConts.GetAllRankTest : EventConts.GetAllRank; - // string jsonStr = ""; - // jsonStr = await HttpSendHelper.HttpPostRequestAsync(url, testDic.ToJson()); + GetJiaZuData data = new GetJiaZuData() + { + property = "campName", + type = "month", + top = 100 + }; - // Log.Info("收到排行榜请求回调:{0}", jsonStr); - // try - // { - // PlayRankRootData playRankRootData = JsonHelper.Deserialize(jsonStr); - // if (playRankRootData != null && playRankRootData.code == 200) - // { - // return playRankRootData.data; - // } - // else - // { - // UITip.ShowMessageBox("世界榜单异常!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => - // { + string url = EventConts.PlatformType == PlatformType.None ? EventConts.GetRankTest : EventConts.GetRankTest; + string jsonStr = ""; + jsonStr = await HttpSendHelper.HttpPostRequestAsync(url, data.ToJson()); - // }, () => - // { - // //Application.Quit(); - // }); - // return null; - // } - // } - // catch (System.Exception e) - // { - // Log.Error("排行榜解析异常:" + e.Message); - // return null; - // throw; - // } + Log.Info("收到排行榜请求回调:{0}", jsonStr); - //} + try + { + JiaZuRankDataRoot playRankRootData = JsonHelper.Deserialize(jsonStr); + if (playRankRootData != null && playRankRootData.code == 200) + { + return playRankRootData.data; + } + else + { + UITip.ShowMessageBox("家族榜单异常!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => + { + + }, () => + { + //Application.Quit(); + }); + return null; + } + } + catch (System.Exception e) + { + Log.Error("排行榜解析异常:" + e.Message); + return null; + throw; + } + + + } } \ No newline at end of file diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 715b8540..1d00cfa5 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -658,6 +658,8 @@ namespace GameLogic #endregion + public int m_ShiJianTimerId = -1; + /// /// 游戏朝代检查 /// @@ -685,10 +687,13 @@ namespace GameLogic // 切换朝代 m_TeamId = id; - m_ScoreScale = ConfigSystem.Instance.Tables.TbTeamConfig.DataList[m_TeamId].ScoreValue; GameEvent.Send(EventConts.SwitchTeamId); + + // 触发黄金时代,等待三十秒延迟 + + } } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankForm.cs index 02a8029b..ca4d73e8 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankForm.cs @@ -52,7 +52,8 @@ namespace GameLogic } private void OnToggle_gongXianRankChange(bool isOn) { - + rankType = 3; + GetRankData(); } private void OnClick_CloseBtn() { @@ -77,7 +78,7 @@ namespace GameLogic List m_PlayRankDataWeek; // ܻ List m_PlayRankDataMonth; // » - List m_PlayRankDataJiaZu; // 建 + List m_PlayRankDataJiaZu; // 建 private async Task GetRankData() { @@ -114,7 +115,7 @@ namespace GameLogic if (m_PlayRankDataJiaZu != null && m_PlayRankDataJiaZu.Count > 0) { - m_PlayRankDatas = m_PlayRankDataJiaZu; + //m_PlayRankDatas = m_PlayRankDataJiaZu; RefreshUI(); return; } @@ -123,28 +124,31 @@ namespace GameLogic // Ĭʾܰ - List data = null; + if (rankType == 1) { + List data = null; data = await DataGameModelManager.Instance.C2S_GetResultRank(rankType); m_PlayRankDataWeek = m_PlayRankDatas; + m_PlayRankDatas = data; } else if (rankType == 2) { + List data = null; data = await DataGameModelManager.Instance.C2S_GetResultRank(rankType); m_PlayRankDataMonth = m_PlayRankDatas; + m_PlayRankDatas = data; } else { // 񵥵Ķ⴦ - - m_PlayRankDataJiaZu = m_PlayRankDatas; + List data = null; + data = await DataGameModelManager.Instance.C2S_GetJiaZuRank(); + m_PlayRankDataJiaZu = data; } - m_PlayRankDatas = data; - RefreshUI(); } @@ -159,10 +163,10 @@ namespace GameLogic { if (!isJiaZuInit) { - m_loopListView_JiaZuView.InitListView(m_PlayRankDatas.Count, OnGetItemByIndexJiaZu); + m_loopListView_JiaZuView.InitListView(m_PlayRankDataJiaZu.Count, OnGetItemByIndexJiaZu); isJiaZuInit = true; } - m_loopListView_JiaZuView.SetListItemCount(m_PlayRankDatas.Count); + m_loopListView_JiaZuView.SetListItemCount(m_PlayRankDataJiaZu.Count); m_loopListView_JiaZuView.RefreshAllShownItem(); } else @@ -206,21 +210,21 @@ namespace GameLogic // LoopListViewItem OnGetItemByIndexJiaZu(LoopListView listView, int index) { - if (index >= m_PlayRankDatas.Count) + if (index >= m_PlayRankDataJiaZu.Count) { return null; } - if (m_PlayRankDatas[index] == null) + if (m_PlayRankDataJiaZu[index] == null) { return null; } LoopListViewItem item = listView.AllocOrNewListViewItem("m_itemRankItemJiaZu"); - UIGameWorldRankItem itemScript = item.GetComponent(); - itemScript.OnInit(index, m_PlayRankDatas[index]); + UIGameWorldWorkRankJiaZuItem itemScript = item.GetComponent(); + itemScript.OnInit(index, m_PlayRankDataJiaZu[index]); return item; } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs new file mode 100644 index 00000000..c72d7cdd --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using TEngine; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace GameLogic +{ + public class UIGameWorldWorkRankJiaZuItem : MonoBehaviour + { + // Start is called before the first frame update + public RectTransform m_KuaiSuRect; + public RectTransform m_ZhengChangRect; + public RectTransform m_ShenDuRect; + public TextMeshProUGUI m_KuaiSuValue; + public TextMeshProUGUI m_ZhengChangValue; + public TextMeshProUGUI m_ShenDuValue; + public Image m_RankIndex; + public TextMeshProUGUI m_RankIndexText; + public TextMeshProUGUI m_TeamName; + public TextMeshProUGUI m_Score; + + public void OnInit(int i, JiaZuData data) + { + if (i < 3) + { + m_RankIndex.gameObject.SetActive(true); + m_RankIndexText.gameObject.SetActive(false); + m_RankIndex.sprite = GameModule.Resource.LoadAsset("jz_" + (i + 1).ToString()); + m_RankIndex.SetNativeSize(); + } + else + { + m_RankIndexText.text = (i + 1).ToString(); + m_RankIndexText.gameObject.SetActive(true); + m_RankIndex.gameObject.SetActive(false); + } + + m_Score.text = UITool.ConvertToString(data.score); + m_TeamName.text = data.name; + } + } +} diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs.meta b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs.meta new file mode 100644 index 00000000..df0ee3a5 --- /dev/null +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldWorkRankJiaZuItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a8754f018cbc92489a45a44b67754ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: