From 80263f61f098979da4a8f8440726e97b419b772c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 30 Dec 2021 13:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Map/SingleExplorePlayerView.prefab | 164 +++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Modules/Explore/ExplorePanel.lua | 1 - .../~Lua/Modules/Player/JumpManager.lua | 3 + .../~Lua/View/SingleExplorePlayerView.lua | 38 ++++ 5 files changed, 204 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab index d8d71123b8..e9c2a5a139 100644 --- a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab +++ b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab @@ -19163,7 +19163,9 @@ 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: 8634994636120734410} + - {fileID: 248637413811290557} m_Father: {fileID: 9211702803995542886} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19213,7 +19215,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u590D\u6D3B\u4E2D..." + m_Text: "\u590D\u6D3B\u4E2D." --- !u!1 &1280090969264805897 GameObject: m_ObjectHideFlags: 0 @@ -91146,6 +91148,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6309302209407048319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 248637413811290557} + - component: {fileID: 3935862417504911882} + - component: {fileID: 1831026039210701570} + m_Layer: 0 + m_Name: tip2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &248637413811290557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309302209407048319} + 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: 1117909453575152904} + m_RootOrder: 1 + 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: 64.5, y: 0.000002861} + m_SizeDelta: {x: 20.44, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3935862417504911882 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309302209407048319} + m_CullTransparentMesh: 0 +--- !u!114 &1831026039210701570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309302209407048319} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: . --- !u!1 &6357989039728665220 GameObject: m_ObjectHideFlags: 0 @@ -101020,6 +101101,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7106361098752905645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8634994636120734410} + - component: {fileID: 506010228683232235} + - component: {fileID: 7467283507892244381} + m_Layer: 0 + m_Name: tip1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8634994636120734410 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7106361098752905645} + 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: 1117909453575152904} + 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: 56, y: 0.000002861} + m_SizeDelta: {x: 20.44, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &506010228683232235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7106361098752905645} + m_CullTransparentMesh: 0 +--- !u!114 &7467283507892244381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7106361098752905645} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: . --- !u!1 &7197431941716830224 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5d315c3420..0b99a6ea34 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1142,7 +1142,7 @@ JumpType = { shenwaihuashen = 120,--身外化身 StateActivity = 121,--固定活动,抽卡 Gem = 122,--命格 - + Explor = 123, BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 Privilege = 10003, -- 特权 diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua index e5ca362f9b..ab16581feb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua @@ -17,7 +17,6 @@ end function ExplorePanel:BindEvent() Util.AddClick(this.backBtn,function() SwitchPanel.ClosePanel(UIName.ExplorePanel, function()end) - this:ClosePanel() end) Util.AddClick(this.lookReward,function() UIManager.OpenPanel(UIName.ExploreRewardPopup,this.mapData.mapId) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index c66e38dc26..75cde1f0c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -867,6 +867,9 @@ local jumpDic = { [JumpType.tehuishangcheng] = function(data,args) UIManager.OpenPanel(UIName.ActivityMainPanel,36) end, + [JumpType.Explor] = function(data,args) + UIManager.OpenPanel(UIName.ExploreMainPanel) + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua index 027746794a..a5191bd522 100644 --- a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua @@ -2,6 +2,7 @@ local mapIconConfig = ConfigManager.GetConfig(ConfigName.MainMapIconConfig) local iconAction = require("Modules/Fight/View/FightMapIconShowView") local GlobalSysConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) +local pointnum = 2 -- 角色对话气泡位置 local m_roleTextPos = { [3] = {pos = Vector3.New(172, 200, 0), angleOffset = 180}, -- 角色朝左, 气泡在右 @@ -101,6 +102,11 @@ function SingleExplorePlayerView:InitComponent() self.PracticeIcon:SetActive(false) self.hurtNum = {} + + self.exploreList = {} + for i = 1,pointnum do + self.exploreList[i] = Util.GetGameObject(self.tip,"tip"..i) + end end function SingleExplorePlayerView:OnOpen(parent) @@ -241,6 +247,10 @@ function SingleExplorePlayerView:Run() end function SingleExplorePlayerView:RefreshHp() + if self.timer then + self.timer:Stop() + self.timer = nil + end if self.data.formationId > 3100 then self.blood:SetActive(true) local hp = ExploreManager.GetHpById(self.data.formationId) @@ -253,6 +263,7 @@ function SingleExplorePlayerView:RefreshHp() self:RoleWalkEnd(nil) end self.activeState = 0 + self:RefreshPoints() else self.bloodSlider.fillAmount = hp/FormationManager.GetFormationPower(self.data.formationId) self.bloodSlider.gameObject:SetActive(true) @@ -272,6 +283,29 @@ function SingleExplorePlayerView:RefreshHp() end end +function SingleExplorePlayerView:RefreshPoints() + if self.timer then + self.timer:Stop() + self.timer = nil + end + local s = function() + local index = 0 + for i = 1,#self.exploreList do + self.exploreList[i].gameObject:SetActive(false) + end + Timer.New(function() + if self.exploreList[index] then + self.exploreList[index].gameObject:SetActive(false) + end + index = (index + 1)%pointnum == 0 and pointnum or (index + 1)%pointnum + self.exploreList[index].gameObject:SetActive(true) + end,0.25,2):Start() + end + s() + self.timer = Timer.New(s,1,-1,false) + self.timer:Start() +end + function SingleExplorePlayerView:SetWalkDir(dir) if self.playerLiveView then self.playerLiveView:SetWalkDir(dir) @@ -864,6 +898,10 @@ function SingleExplorePlayerView:StopAction() self.callList:Clear() self:SetWalkDir(WALK_DIR.IDLE_FRONT) self.hitEffect:SetActive(false) + if self.timer then + self.timer:Stop() + self.timer = nil + end for i = 1, #self.hurtNum do self.hurtNum[i].gameObject:SetActive(false) end