From 0508d1d652f8a8c6f9511196065d25c391703caa Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 22 Oct 2021 16:47: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?=E8=B7=A8=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 231 ++++++++++++++++++ .../View/GeneralBigPopup_YuJianLastResult.lua | 34 +-- .../Modules/YuJianXing/YuJianXingManager.lua | 1 - 3 files changed, 251 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index dac213809b..59cb6d61c4 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3730,6 +3730,7 @@ RectTransform: - {fileID: 5734271925959652319} - {fileID: 2877363311760422400} - {fileID: 3578451953079088383} + - {fileID: 4861018093396107550} m_Father: {fileID: 2423465471356683207} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10612,6 +10613,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7B51\u57FA\u671F" LanguageIndex: 0 +--- !u!1 &3781403253526472122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1393841327296570765} + - component: {fileID: 516528688259841840} + - component: {fileID: 6388126814946443498} + m_Layer: 5 + m_Name: TextImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1393841327296570765 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3781403253526472122} + 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: + - {fileID: 7948948577865161517} + m_Father: {fileID: 4861018093396107550} + 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: -239.59998, y: 90.5} + m_SizeDelta: {x: 402, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &516528688259841840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3781403253526472122} + m_CullTransparentMesh: 0 +--- !u!114 &6388126814946443498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3781403253526472122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 88785b6606f773e43bfb8d365c2689ab, 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 --- !u!1 &3870233943051159496 GameObject: m_ObjectHideFlags: 0 @@ -14460,6 +14536,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5680038674497881281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7948948577865161517} + - component: {fileID: 1375380452230615252} + - component: {fileID: 1923199977537508088} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7948948577865161517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680038674497881281} + 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_Father: {fileID: 1393841327296570765} + 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: -6.6, y: 11} + m_SizeDelta: {x: 315.5, y: 73} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1375380452230615252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680038674497881281} + m_CullTransparentMesh: 0 +--- !u!114 &1923199977537508088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680038674497881281} + 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: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 0 + 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 51 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6682\u65E0\u6BD4\u8D5B\u6570\u636E" + LanguageIndex: 10146 --- !u!1 &5849082044447708470 GameObject: m_ObjectHideFlags: 0 @@ -21028,6 +21184,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8520562720478604777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4861018093396107550} + - component: {fileID: 8204373685354974930} + - component: {fileID: 2147094092786255813} + m_Layer: 5 + m_Name: NoneImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4861018093396107550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8520562720478604777} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1393841327296570765} + m_Father: {fileID: 2234119587365347983} + m_RootOrder: 4 + 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: 90, y: 0.000061035156} + m_SizeDelta: {x: 354, y: 470} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8204373685354974930 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8520562720478604777} + m_CullTransparentMesh: 0 +--- !u!114 &2147094092786255813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8520562720478604777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: e1eb5a78b93294840889587d72740102, 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 --- !u!1 &8539201829702249933 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua index 58daaeac0d..6841a3f043 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua @@ -19,6 +19,7 @@ function this:InitComponent(gameObject) self.SwordPre = Util.GetGameObject(self.grid,"SwordPre") self.roundTime = Util.GetGameObject(gameObject,"tips (2)"):GetComponent("Text") self.preList = {} + self.NoneImage = Util.GetGameObject(gameObject,"NoneImage") end function this:BindEvent() @@ -39,24 +40,29 @@ end function this:Refresh() NetManager.RidingSwardInfoRequest(function () - local data = ConfigManager.GetConfigData(ConfigName.RidingSwardResult,YuJianXingManager.lastResult.rankId).Result - for i = 1, 4 do - for j = 1, #data do - if i == data[j][1] then - local go = self.preList[i] - if not go then - go = newObjToParent(self.SwordPre,self.grid) - self.preList[i] = go + if YuJianXingManager.lastResult.rankId > 0 then + self.NoneImage:SetActive(false) + local data = ConfigManager.GetConfigData(ConfigName.RidingSwardResult,YuJianXingManager.lastResult.rankId).Result + for i = 1, 4 do + for j = 1, #data do + if i == data[j][1] then + local go = self.preList[i] + if not go then + go = newObjToParent(self.SwordPre,self.grid) + self.preList[i] = go + end + local rank = Util.GetGameObject(go,"Image"):GetComponent("Image") + local Img = go:GetComponent("Image") + rank.sprite = self.spLoader:LoadSprite(rankImg[i]) + Img.sprite = self.spLoader:LoadSprite(SwordImg[j]) + go:SetActive(true) end - local rank = Util.GetGameObject(go,"Image"):GetComponent("Image") - local Img = go:GetComponent("Image") - rank.sprite = self.spLoader:LoadSprite(rankImg[i]) - Img.sprite = self.spLoader:LoadSprite(SwordImg[j]) - go:SetActive(true) end end + self.roundTime.text = string.format("比赛场次: %s",TimeStampToDateStr4((YuJianXingManager.lastResult.rankTime))) + else + self.NoneImage:SetActive(true) end - self.roundTime.text = string.format("比赛场次: %s",TimeStampToDateStr4((YuJianXingManager.lastResult.rankTime))) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index afe094b7c3..2892ba54cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -74,7 +74,6 @@ function this.UpdataServerData(msg,func) this.lastResult = msg.lastRank if msg.lastRank.rankId == 0 then LogError("御剑行剧本id为0:") - return end this.curRecordList = {} this.curRecordList = msg.recordLsit