From 86ca33c7a48616a29ccf19933e08cd82dead8282 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 19 Oct 2020 11:39:11 +0800 Subject: [PATCH 1/4] xiaoyao commit --- .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 4 ++-- .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 21 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 1c7f02664c..489814f305 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -177,7 +177,7 @@ function this.UpdateHeroData(id) --获取招募时间 function this.GetHeroDataTime() if not this.HeroData or #this.HeroData < 1 then - return 0 + return 0,0 end for i,v in ipairs(this.HeroData) do if v.remainTime - PlayerManager.serverTime < 1 then @@ -287,7 +287,7 @@ end --boss 剩余时间 function this.GetMonsterDataReMainTimesAndTime() if not this.MonsterData or #this.MonsterData < 1 then - return 0 + return 0,0 end local removeData = {} for i,v in ipairs(this.MonsterData) do diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 0878b539e0..454613390e 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -13,6 +13,9 @@ local eventTimer local shopLeftTime=0 local rouleLeftTime=0 local bossLeftTime=0 +local shopLeftTimes=0 +local rouleLeftTimes=0 +local bossLeftTimes=0 local isPlayMove=0 local targetBtn @@ -151,9 +154,9 @@ function this.RefreshEventBtn() else this.shopBtn:SetActive(false) end - shopLeftTime=XiaoYaoManager.GetHeroDataTime() or 0 - rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime or 0 - bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() or 0 + shopLeftTimes,shopLeftTime=XiaoYaoManager.GetHeroDataTime() + rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime + bossLeftTime,bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() end --开始跑图 function this.RunMap(_data) @@ -239,7 +242,8 @@ function this.EventTrigger(_data) this.SetEventBtn(_data) elseif _data.pathType==7 then --终极大奖 UIManager.OpenPanel(UIName.XiaoYaoEventPanel,0,_data.drop) - end + end + this.RefreshEventBtn() if _data.drop.itemlist and #_data.drop.itemlist > 0 and _data.pathType~=7 then local content = {} for i = 1, #_data.drop.itemlist do @@ -255,8 +259,7 @@ function this.EventTrigger(_data) end function this.SetEventBtn(_data) - targetBtn:SetActive(true) - shopLeftTime=_data.overTime + targetBtn:SetActive(true) if isAuto then this.PlayEffect() PopupTipPanel.ShowTip(string.format("触发仙缘★%s★",allGridData[curGridIndex].eventData.Desc)) @@ -410,9 +413,9 @@ function this.InitShowEvent() else this.shopBtn:SetActive(false) end - shopLeftTime=XiaoYaoManager.GetHeroDataTime() or 0 - rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime or 0 - bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() or 0 + shopLeftTimes,shopLeftTime=XiaoYaoManager.GetHeroDataTime() + rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime + bossLeftTimes,bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() if not eventTimer then eventTimer=this.DownTime() end From 964abba2a04ff7faf0fbd850d81297f025670d9b Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 19 Oct 2020 11:53:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E9=80=8D=E9=81=A5=E6=B8=B8=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E9=A2=84=E8=AE=BE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab | 495 +++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../Modules/Player/AutoRecoverManager.lua | 11 + .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 81 ++- 4 files changed, 530 insertions(+), 58 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 8186d5b862..64cb5b2ee5 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -328,7 +328,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &636454027232682164 RectTransform: m_ObjectHideFlags: 0 @@ -342,13 +342,14 @@ RectTransform: m_Children: - {fileID: 471220334488304630} - {fileID: 798232544032123905} + - {fileID: 3628702650913898151} m_Father: {fileID: 913146193029197762} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92.5, y: -96.5} - m_SizeDelta: {x: 185, y: 193} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6660674991966677913 CanvasRenderer: @@ -429,6 +430,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &227984750627321471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898296640287834516} + - component: {fileID: 4583142178012620037} + - component: {fileID: 8425423844459574640} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &898296640287834516 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227984750627321471} + 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: 2080039487384624122} + m_Father: {fileID: 91866266988071576} + m_RootOrder: 2 + 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: 78.7, y: 153.82993} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4583142178012620037 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227984750627321471} + m_CullTransparentMesh: 0 +--- !u!114 &8425423844459574640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227984750627321471} + 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: 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_Sprite: {fileID: 21300000, guid: 178a875a740aa004cacbbf260009fcbe, 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 &482284197251879040 GameObject: m_ObjectHideFlags: 0 @@ -725,6 +801,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1232708345330239932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3785957058261045306} + - component: {fileID: 8283294283153217480} + - component: {fileID: 7128540676808915997} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3785957058261045306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232708345330239932} + 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: 4173429234087088690} + m_Father: {fileID: 8951745513582367480} + m_RootOrder: 2 + 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: 78.7, y: -65.1} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8283294283153217480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232708345330239932} + m_CullTransparentMesh: 0 +--- !u!114 &7128540676808915997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232708345330239932} + 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: 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_Sprite: {fileID: 21300000, guid: 178a875a740aa004cacbbf260009fcbe, 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 &1459533619290858446 GameObject: m_ObjectHideFlags: 0 @@ -921,6 +1072,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u81EA\u52A8\u6E38\u5386" +--- !u!1 &1845744620343455135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2590050801974389363} + - component: {fileID: 2575623864218595775} + - component: {fileID: 3724623201295500454} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2590050801974389363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845744620343455135} + 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: 3628702650913898151} + 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: 0.6, y: -1.1000214} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2575623864218595775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845744620343455135} + m_CullTransparentMesh: 0 +--- !u!114 &3724623201295500454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845744620343455135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9725491, g: 0.8117648, b: 0.7411765, 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: 38 + 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: 0 + m_LineSpacing: 1 + m_Text: 3 --- !u!1 &1906148736742699112 GameObject: m_ObjectHideFlags: 0 @@ -1193,6 +1423,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2905917128800344441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2080039487384624122} + - component: {fileID: 1953929430337853373} + - component: {fileID: 1842105146524280669} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2080039487384624122 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2905917128800344441} + 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: 898296640287834516} + 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: 0.6, y: -1.1000214} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1953929430337853373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2905917128800344441} + m_CullTransparentMesh: 0 +--- !u!114 &1842105146524280669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2905917128800344441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9725491, g: 0.8117648, b: 0.7411765, 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: 38 + 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: 0 + m_LineSpacing: 1 + m_Text: 3 --- !u!1 &3048484002411507146 GameObject: m_ObjectHideFlags: 0 @@ -1442,7 +1751,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8951745513582367480 RectTransform: m_ObjectHideFlags: 0 @@ -1456,13 +1765,14 @@ RectTransform: m_Children: - {fileID: 120838204554284271} - {fileID: 5281754449960765727} + - {fileID: 3785957058261045306} m_Father: {fileID: 913146193029197762} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92.5, y: -315.43} - m_SizeDelta: {x: 185, y: 193} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8809899214388357845 CanvasRenderer: @@ -2073,6 +2383,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5235723474202556634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3628702650913898151} + - component: {fileID: 6278630944366480642} + - component: {fileID: 7307069046729846296} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3628702650913898151 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235723474202556634} + 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: 2590050801974389363} + m_Father: {fileID: 636454027232682164} + m_RootOrder: 2 + 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: 78.7, y: -284.03003} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6278630944366480642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235723474202556634} + m_CullTransparentMesh: 0 +--- !u!114 &7307069046729846296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235723474202556634} + 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: 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_Sprite: {fileID: 21300000, guid: 178a875a740aa004cacbbf260009fcbe, 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 &5307116696885147338 GameObject: m_ObjectHideFlags: 0 @@ -2118,6 +2503,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5307116696885147338} m_CullTransparentMesh: 0 +--- !u!1 &5430106853088899741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4173429234087088690} + - component: {fileID: 5141612764095462461} + - component: {fileID: 2809382106372686987} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4173429234087088690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430106853088899741} + 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: 3785957058261045306} + 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: 0.6, y: -1.1000214} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5141612764095462461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430106853088899741} + m_CullTransparentMesh: 0 +--- !u!114 &2809382106372686987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430106853088899741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9725491, g: 0.8117648, b: 0.7411765, 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: 38 + 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: 0 + m_LineSpacing: 1 + m_Text: 3 --- !u!1 &5445241727744868617 GameObject: m_ObjectHideFlags: 0 @@ -3745,7 +4209,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &91866266988071576 RectTransform: m_ObjectHideFlags: 0 @@ -3759,13 +4223,14 @@ RectTransform: m_Children: - {fileID: 7892887258064875542} - {fileID: 9198196378565562289} + - {fileID: 898296640287834516} m_Father: {fileID: 913146193029197762} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92.5, y: -534.36} - m_SizeDelta: {x: 185, y: 193} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &497349341869745824 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 302acd0ebb..f83694fb7b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -512,6 +512,7 @@ UpViewRechargeType = { SummonStamps=91, --召唤券 HeroExchange=92,--神将置换 TianGong=93,--天宫币 + YunYouVle=97,--云游值 Iron = 1001,--铁矿石 FixforDan = 1002,--修为丹 EndlessCoin = 1201,--无尽币 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index 19268912be..755d210736 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -60,6 +60,17 @@ local _TimeCheckFunc = { return -1 end end, + [UpViewRechargeType.YunYouVle] = function() + local curCount = BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) + local maxCount = PrivilegeManager.GetPrivilegeNumber(39) + if curCount < maxCount then + local nextFreshTime = BagManager.bagDatas[UpViewRechargeType.YunYouVle].nextFlushTime + local remationTime = nextFreshTime - PlayerManager.serverTime -- 下一次刷新的时间 + return remationTime + else -- 数量已满返回 -1 + return -1 + end + end, } diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 0878b539e0..57f19337ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -11,8 +11,11 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local saiNum=1 --骰子数量 local eventTimer local shopLeftTime=0 +local heroNum=0 local rouleLeftTime=0 +local rouleNum=0 local bossLeftTime=0 +local bossNum=0 local isPlayMove=0 local targetBtn @@ -24,10 +27,13 @@ function this:InitComponent() this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") this.shopBtn = Util.GetGameObject(self.gameObject, "btnGrid/shopBtn") this.shopTime=Util.GetGameObject(self.gameObject, "btnGrid/shopBtn/time"):GetComponent("Text") + this.shopNum=Util.GetGameObject(self.gameObject, "btnGrid/shopBtn/num/Text"):GetComponent("Text") this.rouleBtn = Util.GetGameObject(self.gameObject, "btnGrid/rouleBtn") this.rouleTime=Util.GetGameObject(self.gameObject, "btnGrid/rouleBtn/time"):GetComponent("Text") + this.rouleNum=Util.GetGameObject(self.gameObject, "btnGrid/rouleBtn/num/Text"):GetComponent("Text") this.bossBtn = Util.GetGameObject(self.gameObject, "btnGrid/bossBtn") this.bossTime=Util.GetGameObject(self.gameObject, "btnGrid/bossBtn/time"):GetComponent("Text") + this.bossNum=Util.GetGameObject(self.gameObject, "btnGrid/bossBtn/num/Text"):GetComponent("Text") this.previewBtn=Util.GetGameObject(self.gameObject, "previewBtn") this.autoBtn=Util.GetGameObject(self.gameObject, "auto")--自动游历按钮 this.toggle=Util.GetGameObject(self.gameObject, "auto/toggle")--自动游历开关显示 @@ -132,29 +138,7 @@ function this:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.RefreshEventShow, this.RefreshEventBtn) Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.PlayEventEffect, this.PlayEffect) end ---刷新界面事件入口按钮显示隐藏 -function this.RefreshEventBtn() - if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then - this.rouleBtn:SetActive(true) - else - this.rouleBtn:SetActive(false) - end - local temp = XiaoYaoManager.GetMonsterDatas() - if temp and #temp > 0 then - this.bossBtn:SetActive(true) - else - this.bossBtn:SetActive(false) - end - local temp = XiaoYaoManager.GetHeroDatas() - if temp and #temp > 0 then - this.shopBtn:SetActive(true) - else - this.shopBtn:SetActive(false) - end - shopLeftTime=XiaoYaoManager.GetHeroDataTime() or 0 - rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime or 0 - bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() or 0 -end + --开始跑图 function this.RunMap(_data) this.startBtn:GetComponent("Button").enabled=false @@ -218,6 +202,7 @@ function this.EventTrigger(_data) Util.GetGameObject(this.gridParent.transform:GetChild(curGridIndex-1).gameObject,"eventPoint"):SetActive(false) Log("触发事件类型为:".._data.pathType) + Log("游戏当前时间为:"..PlayerManager.serverTime) Log("触发事件时间为:".._data.overTime) if _data.pathType==0 then --普通节点 LogGreen("普通奖励:"..#_data.drop) @@ -255,8 +240,7 @@ function this.EventTrigger(_data) end function this.SetEventBtn(_data) - targetBtn:SetActive(true) - shopLeftTime=_data.overTime + this.RefreshEventBtn() if isAuto then this.PlayEffect() PopupTipPanel.ShowTip(string.format("触发仙缘★%s★",allGridData[curGridIndex].eventData.Desc)) @@ -286,8 +270,7 @@ function this:OnOpen(_mapData) local x, y=Map_Pos2UV(mapData.cell[i].cellId) allGridData[i]={} allGridData[i].x=x*128-64 - allGridData[i].y=-y*128+64 - Log("pointid:"..mapData.cell[i].pointId) + allGridData[i].y=-y*128+64 if mapData.cell[i].pointId>0 then allGridData[i].eventData = ConfigManager.GetConfigData(ConfigName.MapPointConfig,mapData.cell[i].pointId) if allGridData[i].eventData.Icon==30 then @@ -310,8 +293,7 @@ function this:OnOpen(_mapData) local eventObj=Util.GetGameObject(obj.gameObject,"eventPoint") if allGridData[i].eventData then eventObj:SetActive(true) - if allGridData[i].rewardId then - Log("rewardId:"..allGridData[i].rewardId) + if allGridData[i].rewardId then local rewardData=ConfigManager.GetConfigData(ConfigName.RewardGroup,allGridData[i].rewardId) local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,rewardData.ShowItem[1][1]) Util.GetGameObject(eventObj,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig.ResourceID)) @@ -342,9 +324,8 @@ function this:OnOpen(_mapData) for i = 1, #mapBg do Log(mapBg[i]) this.mapParent.transform:GetChild(i-1):GetComponent("Image").sprite=Util.LoadSprite(mapBg[i]) - end - local costItemId=mapConfig.Consume[1] - this.costIcon.sprite=Util.LoadSprite(GetResourcePath(itemConfig[costItemId].ResourceID)) + end + end local npc local scale @@ -393,6 +374,13 @@ function this.InitShowEvent() if mapData.diceNum>1 then --骰子x2 saiNum=mapData.diceNum end + this.RefreshEventBtn() + if not eventTimer then + eventTimer=this.DownTime() + end +end +--刷新界面事件入口按钮显示隐藏 +function this.RefreshEventBtn() if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then this.rouleBtn:SetActive(true) else @@ -410,13 +398,16 @@ function this.InitShowEvent() else this.shopBtn:SetActive(false) end - shopLeftTime=XiaoYaoManager.GetHeroDataTime() or 0 - rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime or 0 - bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() or 0 - if not eventTimer then - eventTimer=this.DownTime() - end + heroNum,shopLeftTime=XiaoYaoManager.GetHeroDataTime() + rouleNum,rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableTimes,XiaoYaoManager.luckyluckyTurnTableRemainTime + bossNum,bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() + this.shopNum.text=tostring(heroNum) + this.rouleNum.text=tostring(rouleNum) + this.bossNum.text=tostring(bossNum) + + Log(string.format("boss个数:%d,boss时间:%d",bossNum,bossLeftTime)) end + --控制地图移动 function this.MapMove(curX,moveTime) if curX>2700 and this.mapParent:GetComponent("RectTransform").localPosition.x<=-2200 then @@ -431,7 +422,11 @@ end -- 逍遥点是否显示倒计时 function this.ShowCountTime() - this.bgTime:SetActive(not EndLessMapManager.EnergyEnough()) + this.costIcon.sprite=Util.LoadSprite(GetResourcePath(itemConfig[UpViewRechargeType.YunYouVle].ResourceID)) + local curValue=BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) + local maxValue=PrivilegeManager.GetPrivilegeNumber(39) + this.costInfo.text=string.format("%d/%d",curValue,maxValue) + this.bgTime:SetActive(curValue=maxValue then -- 回复满了,在地图外面可以停止计时器 this.timer:Stop() this.bgTime:SetActive(false) @@ -491,7 +486,7 @@ end function this:OnShow() --显示资源条 - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) this.ShowCountTime() isPlayMove=0 end From 9143bd4236c39294d7758ac59b8ad126b005e692 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 19 Oct 2020 12:16:20 +0800 Subject: [PATCH 3/4] yushetijiao --- .../Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 64cb5b2ee5..2ff175f9bd 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -455,7 +455,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 227984750627321471} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: @@ -465,7 +465,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: 78.7, y: 153.82993} + m_AnchoredPosition: {x: 78.7, y: -65.1} m_SizeDelta: {x: 42, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4583142178012620037 @@ -2408,7 +2408,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5235723474202556634} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: @@ -2418,7 +2418,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: 78.7, y: -284.03003} + m_AnchoredPosition: {x: 78.7, y: -65.1} m_SizeDelta: {x: 42, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6278630944366480642 From 01f5227c72724b37b2c941ef1e8ebc9f54e16c46 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 19 Oct 2020 13:50:23 +0800 Subject: [PATCH 4/4] xiaoyao commit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 10 +++++----- .../~Lua/Modules/Player/AutoRecoverManager.lua | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f83694fb7b..82720b0742 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -508,11 +508,11 @@ UpViewRechargeType = { FriendPoint = 69, -- 友情点 ChoasCoin = 74, -- 混沌玉 TopMatchCoin = 86, -- 至尊之证 - FindFairy=87, --寻仙玉 - SummonStamps=91, --召唤券 - HeroExchange=92,--神将置换 - TianGong=93,--天宫币 - YunYouVle=97,--云游值 + FindFairy = 87, --寻仙玉 + SummonStamps = 91, --召唤券 + HeroExchange = 92,--神将置换 + TianGong = 93,--天宫币 + YunYouVle = 97, --云游值 Iron = 1001,--铁矿石 FixforDan = 1002,--修为丹 EndlessCoin = 1201,--无尽币 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index 755d210736..7515b8f0bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -71,6 +71,7 @@ local _TimeCheckFunc = { return -1 end end, + }