root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

探索提交

dev_chengFeng
jiaoyangna 2022-03-17 15:21:08 +08:00
parent a82de03880
commit 31b1721510
7 changed files with 333 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab
View File

@ -1273,6 +1273,8 @@ RectTransform:
- {fileID: 830083511673587919}
- {fileID: 5190378739448930435}
- {fileID: 8546165598943355784}
- {fileID: 4886692840100403304}
- {fileID: 6070882447401274561}
m_Father: {fileID: 6278899851612589502}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1366,6 +1368,123 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &3483640329960074667
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4886692840100403304}
- component: {fileID: 4542243681560148783}
- component: {fileID: 5266043566302596523}
- component: {fileID: 8690288494793963944}
m_Layer: 5
m_Name: rankBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4886692840100403304
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3483640329960074667}
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: 1731085366901955660}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -940, y: -78}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 1, y: 1}
--- !u!222 &4542243681560148783
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3483640329960074667}
m_CullTransparentMesh: 0
--- !u!114 &5266043566302596523
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3483640329960074667}
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: 0ae4375e796ee934997142d1bb379d5d, 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!114 &8690288494793963944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3483640329960074667}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5266043566302596523}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3488711613860611526
GameObject:
m_ObjectHideFlags: 0
@ -3790,6 +3909,123 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8586263013107943241
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6070882447401274561}
- component: {fileID: 8493658703468723691}
- component: {fileID: 3704132862183246943}
- component: {fileID: 8273721206133310733}
m_Layer: 5
m_Name: taskBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6070882447401274561
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8586263013107943241}
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: 1731085366901955660}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -27.5, y: 392}
m_SizeDelta: {x: 128, y: 126}
m_Pivot: {x: 1, y: 0}
--- !u!222 &8493658703468723691
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8586263013107943241}
m_CullTransparentMesh: 0
--- !u!114 &3704132862183246943
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8586263013107943241}
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: 7d5a425badc14734bbbef0a1e951006a, 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!114 &8273721206133310733
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8586263013107943241}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3704132862183246943}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &8975184642546558864
GameObject:
m_ObjectHideFlags: 0

6
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
View File

@ -1439,6 +1439,8 @@ ActivityTypeDef = {
qiandaohaoli = 95, --节日签到
zhongzhichengcheng = 96,
PowerRice = 97,--战力冲刺
EastSeaFindGod = 98, --东海寻仙
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {
@ -1465,6 +1467,8 @@ TaskTypeDef = {
wujinfuben = 12,--牛气冲天任务
JourneyWithWind = 13,--缥缈之旅任务
HomeLandTask = 14,--家园升级任务
EastSeaFindGod = 15,
ExploreTask = 16,
}
--商品类型
@ -2330,6 +2334,7 @@ RANK_TYPE = {
WORLDARENA=40, --玉虚论道排行榜
LINGMAIMIJING_RANK = 41,--灵脉秘境排行榜
POWER_RICE = 42,--战力冲刺
ExploreRank = 43,--战力冲刺
}
--东海寻仙弹窗类型
@ -2808,6 +2813,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
--车迟斗法
[35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
[36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
[37] = { bgImage = "", name = "探索排行" ,rankType = RANK_TYPE.ExploreRank,activiteId = 0,isRankingMainPanelShow = false},
}

1
Assets/ManagedResources/~Lua/Data/ConfigData.lua
View File

@ -253,6 +253,7 @@ ConfigName = {
EquipStrengthen = "EquipStrengthen",
EquipRankUp = "EquipRankUp",
TrumpStar = "TrumpStar",
exploreTask = "ExploreTask",
}
require "Framework/GameDataBase"

1
Assets/ManagedResources/~Lua/Data/UIData.lua
View File

@ -452,6 +452,7 @@ UIName = {
FestevalPanel = 461,
HeroPreviewNewPanel = 460,--抽卡奖池预览
PowerRicePanel = 462,--战力冲刺界面
EastSeaFindGodPanel = 463,--东海寻仙
}
SubUIConfig = {

18
Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua
View File

@ -86,6 +86,8 @@ function ExploreMainPanel:InitComponent()
self.helpBtn = Util.GetGameObject(self.gameObject, "btns/helpBtn")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.rankBtn = Util.GetGameObject(self.gameObject, "btns/rankBtn")
self.taskBtn = Util.GetGameObject(self.gameObject, "btns/taskBtn")
end
--绑定事件（用于子类重写）
@ -120,7 +122,21 @@ function ExploreMainPanel:BindEvent()
--选择队伍弹窗
UIManager.OpenPanel(UIName.GeneralSizeFitterPopup,GENERALSIZEFITTER_TYPE.ExploreSelectFormation,ExploreManager.GetFormationData(0),1,ExploreManager.ExploreMapData[self.mapId])
end)
Util.AddClick(self.rankBtn,function()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[37])
end)
Util.AddClick(self.taskBtn,function()
MonsterCampManager.preType = 2
UIManager.OpenPanel(UIName.TrialRewardPopup,ExploreManager.SetRewardData(),function(id,rewardFunc)
NetManager.TakeMissionRewardRequest(TaskTypeDef.ExploreTask,id,function (msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
if rewardFunc then
rewardFunc()
end
end)
end)
end,1)
end)
BindRedPointObject(RedPointType.ExploreFunc,self.oneKeyExploreBtnRed)
end

60
Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua
View File

@ -38,6 +38,7 @@ function this.Initialize()
this.FormationData[formationId].dropReward = {}
end
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange)
this.InitMissionData()
end
function this.OnLevelChange()
@ -277,5 +278,64 @@ function this.CheckRedPoint()
end
return false
end
function this.InitMissionData()
this.mission = {}
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.exploreTask)) do
local data = {}
data.Id = v.Id
data.index = #this.mission + 1
data.Desc = v.ContentsShow
data.info = ""
data.progress = 0
data.value = v.Values[2][1]
data.jump = -1
data.BoxReward = {}
for i = 1,#v.Reward do
table.insert(data.BoxReward ,v.Reward[i])
end
data.state = 0
table.insert(this.mission,data)
end
end
function this.SetRewardData()
local missions = {}
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.ExploreTask)
for k,v in ipairs(this.mission) do
for j = 1,#allMissionData do
if v.Id == allMissionData[j].missionId then
v.progress = allMissionData[j].progress
if allMissionData[j].state == 2 then
-- goText.text="已领取"
v.progress = v.value
v.state = 0
elseif allMissionData[j].state == 1 then
-- goText.text="领取"
v.progress = v.value
v.state = allMissionData[j].state
elseif allMissionData[j].state == 0 then
-- goText.text="前往"
v.state = 2
end
v.info = v.Desc ..("(")..v.progress.."/"..v.value..(")")
table.insert(missions,v)
break
end
end
end
local typeIndex = {
[0] = 2,
[1] = 0,
[2] = 1,
}
table.sort(missions, function(a,b)
if typeIndex[a.state] == typeIndex[b.state] then
return a.Id < b.Id
else
return typeIndex[a.state] < typeIndex[b.state]
end
end)
return missions
end
return this

11
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
View File

@ -234,6 +234,9 @@ function this.SetRankingInfo(isTop, isAnim)
elseif sData.rankType == RANK_TYPE.PERSON_CHALLENGE then--跨服天梯
dData = { rankInfo = {param1 = myRankData.param1},
force = myRankData.param1,}
elseif sData.rankType == RANK_TYPE.ExploreRank then--跨服天梯
dData = { rankInfo = {param1 = myRankData.param1},
force = myRankData.param1,}
end
this.SetInfoShow(this.infoGo,dData,sData.rankType)
--数据拆分
@ -284,6 +287,7 @@ function this.SetHeadsInfo(data,root,index,name,level)
this.firstHeadName.text = name
this.SetInfoShow(this.firstHeadinfoGo,data,sData.rankType)
--在战力冲刺中所有人的第一名不一定是排行榜的第一名有战力限制
LogGreen("data.rankInfo.rank:"..tostring(data.rankInfo.rank) )
this.SetRankingNum(this.firsthead, data.rankInfo.rank)
--data.sex
--加载立绘
@ -625,6 +629,13 @@ function this.SetInfoShow(go,data,rankType,Value0)
arenaScore:SetActive(true)
local score = data.rankInfo.param1 >= 0 and data.rankInfo.param1 or 0
arenaScore:GetComponent("Text").text = "灵气: ".. score
elseif rankType==RANK_TYPE.ExploreRank then--灵脉秘境
if Value0 then
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
end
arenaScore:SetActive(true)
local score = data.rankInfo.param1 >= 0 and data.rankInfo.param1 or 0
arenaScore:GetComponent("Text").text = "探索杀敌数: ".. score
end
end
return RankingSingleListPanel