From 46d38b01ecd8a6ab62ebc9cce529cd1133e6e1ed Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 14 Oct 2021 18:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=89=91=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/TagAtlas/r_Dungeon_004.png | Bin 0 -> 19241 bytes .../Atlas/TagAtlas/r_Dungeon_004.png.meta | 99 ++++++++++++++++++ .../UI/YuJianXing/YuJianXingPanel.prefab | 89 +++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 2 +- .../View/GeneralBigPopup_YuJianLastResult.lua | 2 +- .../Modules/YuJianXing/YuJianXingManager.lua | 3 +- .../Modules/YuJianXing/YuJianXingPanel.lua | 13 +-- 7 files changed, 194 insertions(+), 14 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png create mode 100644 Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png.meta diff --git a/Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png b/Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png new file mode 100644 index 0000000000000000000000000000000000000000..98a4c50729271927e15bf1a558bdcccece9a648d GIT binary patch literal 19241 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 Qc>n+a07*qoM6N<$f?2$-VE_OC literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png.meta new file mode 100644 index 0000000000..b3a20ccab7 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/r_Dungeon_004.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 3163a133e2b82fc4c92d5395f31c55e5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2e07e7aef4e91f5459c7f67f4720a790 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab index ae64671acb..2f7e4fcbbf 100644 --- a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab @@ -612,7 +612,7 @@ RectTransform: 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: 193.8, y: 20.2} + m_AnchoredPosition: {x: 212, y: 20.2} m_SizeDelta: {x: 520.6, y: 163} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8394200931281104665 @@ -802,6 +802,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3100141905683586139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3070260945047934797} + - component: {fileID: 72890709324579209} + - component: {fileID: 3515077434335806758} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3070260945047934797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141905683586139} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 60.942368} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 382989129249096390} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &72890709324579209 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141905683586139} + m_CullTransparentMesh: 0 +--- !u!114 &3515077434335806758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141905683586139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9019608, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7ADE\u731C\u6709\u793C" + LanguageIndex: 0 --- !u!1 &3202043061616719039 GameObject: m_ObjectHideFlags: 0 @@ -1665,14 +1745,15 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 3070260945047934797} m_Father: {fileID: 7225928139430877591} m_RootOrder: 0 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: -261, y: 0} - m_SizeDelta: {x: 20, y: 191} + m_SizeDelta: {x: 50, y: 191} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2076739492594695998 CanvasRenderer: @@ -1702,7 +1783,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e18e0fda570ca8140ad838af36b88960, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a9a19e7998087f4caa9c49984bc79f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0027771172..26f5feffa7 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -488,7 +488,7 @@ PanelType = { QiJie = {14,16,1240},--七界试炼 WorldArena = { 107,16,23}, --玉虚论道 Compound_equip = { 14, 16,1258 }, --装备合成 - YuJianXing = {14,16}--御剑行 + YuJianXing = {14,16,1010}--御剑行 } diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua index 4cdfc85e91..cd84200950 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua @@ -4,7 +4,7 @@ local rankImg = { [1] = "r_Dungeon_001", [2] = "r_Dungeon_002", [3] = "r_Dungeon_003", - [4] = "y_yujianxing_paimingsi", + [4] = "r_Dungeon_004", } local SwordImg = { [1] = "y_yujianxing_banner01_01", diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 7576f68b31..1d5dc5a85d 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -60,8 +60,8 @@ function this.UpdataServerPanelData(msg,func) this.activityTimeCount = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing).endTime this.curResultId = {} this.curResultId = msg.rankId + Log("界面剧本Id:"..tostring(msg.rankId)) Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateRank) - -- CheckRedPointStatus(RedPointType.YuJianXingMian) if func then func() end @@ -86,7 +86,6 @@ function this.UpdataServerData(msg,func) end end ) this.joinCount = msg.betCount--参与投注的轮数 - -- CheckRedPointStatus(RedPointType.YuJianXingMian) if func then func() end diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index d65dfaf527..85adcc5278 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -57,11 +57,13 @@ function YuJianXingPanel:BindEvent() end) Util.AddOnceClick(self.btnRecord,function () - if #YuJianXingManager.curRecordList <= 0 then - PopupTipPanel.ShowTip("暂无竞猜纪录!") - return - end - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YuJianXingRecord) + NetManager.RidingSwardInfoRequest(function () + if #YuJianXingManager.curRecordList <= 0 then + PopupTipPanel.ShowTip("暂无竞猜纪录!") + return + end + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YuJianXingRecord) + end) end) Util.AddOnceClick(self.btnRank,function () @@ -156,7 +158,6 @@ function YuJianXingPanel:StartAnimation() end function YuJianXingPanel:SetTime() - LogBlue("设置了时间~") if self.timer then self.timer:Stop() self.timer = nil