【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-16 18:30:08 +08:00
parent 6012b533ca
commit d8dd88b2e2
6 changed files with 151 additions and 21 deletions

View File

@ -2745,6 +2745,7 @@ RectTransform:
m_Children:
- {fileID: 3943615543776464734}
- {fileID: 7694294849058607152}
- {fileID: 4347320418341876594}
m_Father: {fileID: 1454780772259464311}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5288,6 +5289,106 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "3370/\u5206"
--- !u!1 &6017153772183952367
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4347320418341876594}
- component: {fileID: 8539191546856473124}
- component: {fileID: 4138743717236714311}
- component: {fileID: 7372498119318308406}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4347320418341876594
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6017153772183952367}
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: 8713029853791401389}
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: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8539191546856473124
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6017153772183952367}
m_CullTransparentMesh: 0
--- !u!114 &4138743717236714311
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6017153772183952367}
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: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5C1A\u672A\u5360\u9886\u7075\u8109\uFF01"
--- !u!114 &7372498119318308406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6017153772183952367}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &6427642781119635253
GameObject:
m_ObjectHideFlags: 0

View File

@ -144,11 +144,18 @@ function ArenaResultPopup:OnOpen(_args,_fun)
redResult:SetActive(false)
bigResult.sprite = this.spLoader:LoadSprite(isWin and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
bigResult:SetNativeSize()
else
elseif panelType == 1 then
blueResult:SetActive(true)
redResult:SetActive(true)
bigResult.sprite = this.spLoader:LoadSprite("r_playerrumble_wan_zh")
bigResult.transform.sizeDelta = Vector2.New(420, 420)
elseif panelType == 2 then
blueResult:SetActive(true)
redResult:SetActive(true)
bigResult.sprite = this.spLoader:LoadSprite("r_playerrumble_wan_zh")
bigResult.transform.sizeDelta = Vector2.New(420, 420)
blueScore:SetActive(false)
redScore:SetActive(false)
end

View File

@ -534,8 +534,6 @@ function this.ShowBattleResult(result, msg)
end
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
this.ShowBattleResultByTaSuiLingXiao()
-- elseif fightType == BATTLE_TYPE.QIJIE_FIGHT then
-- this.ShowBattleResultByQiJieShiLian()
else
LogRed("result:"..tostring(result))
if result == 0 then -- 失败

View File

@ -74,9 +74,22 @@ function this.StartFight()
else
NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg)
this.root:ClosePanel()
local fightData = BattleManager.GetBattleServerData(msg)
LingMaiMiJingManager.battleResult = msg
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.LINGMAIMIJING):SetResult(msg.result)
local arg = {}
arg.panelType=2
arg.result = msg.result
arg.blue = {}
arg.blue.uid = PlayerManager.uid
arg.blue.name = PlayerManager.nickName
arg.blue.head = PlayerManager.head
arg.blue.frame = HeadManager.GetCurFrameId()
arg.red= {}
arg.red.uid = this.nodeData.uid
arg.red.name = this.nodeData.name
-- arg.red.head = this.pData.head
-- arg.red.frame = this.pData.headFrame
-- 不用回放直接显示结果
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
end)
end
end

View File

@ -6,7 +6,7 @@ function this.Initialize()
this.state = 1--当前状态
this.startTime = 0--我开始占领此矿脉的时间
this.endTime = 1638460800--结束时间
this.myPlaceId = 3--当前我占领的矿脉的id
this.myPlaceId = 1--当前我占领的矿脉的id
this.fightTime = 0--我的剩余挑战次数
this.recordData = {}
this.battleResult = {}
@ -44,14 +44,14 @@ end
--获取服务器发来的信息
function this.GetLingMaiServerData(msg,func)
this.state = msg.state == 0 and 4 or msg.state
this.myPlaceId = msg.myOccupyId == 0 and 1 or msg.myOccupyId
this.myPlaceId = msg.myOccupyId
this.startTime = msg.myOccupyTime
this.fightTime = msg.remainChangeTimes
-- this.endTime = msg.state.endTime
this.recordData = msg.recordData
this.curPage = lodeConfig[this.myPlaceId].PageNo
LogGreen("state:"..tostring(msg.state).." myPlaceId:"..tostring(msg.myOccupyId).." startTime:"..tostring(msg.myOccupyTime).." fightTime:"..tostring(msg.remainChangeTimes).." recordData:"..tostring(#msg.recordData).." curPage:"..tostring(this.curPage))
for i = 1, #msg.recordData do
this.curPage = lodeConfig[msg.recordData[i].id].PageNo
LogYellow("id:"..tostring(msg.recordData[i].id).." uid:"..tostring(msg.recordData[i].uid).." userName:"..tostring(msg.recordData[i].userName).." practiceLevel:"..tostring(msg.recordData[i].practiceLevel))
-- msg.recordData[i].userName = PracticeManager.SetNameColor(msg.recordData[i].userName,msg.recordData[i].practiceLevel)
end

View File

@ -20,6 +20,8 @@ function LingMaiMiJingPanel:InitComponent()
self.leftTime = Util.GetGameObject(self.topBar,"Text"):GetComponent("Text")
--bottom
self.bottom = Util.GetGameObject(self.gameObject,"bottomBar")
self.time = Util.GetGameObject(self.bottom,"time")
self.TextTip = Util.GetGameObject(self.bottom,"Text")
self.mytime = Util.GetGameObject(self.bottom,"time/Text"):GetComponent("Text")
self.rewardGrid = Util.GetGameObject(self.bottom,"grid")
self.rewardPre = Util.GetGameObject(self.rewardGrid,"rewardPre")
@ -84,19 +86,28 @@ function LingMaiMiJingPanel:OnShow()
end
function LingMaiMiJingPanel:SetMydata()
local configData = lodeConfig[self.data.myPlaceId]
for i = 1, #self.rewardList do
self.rewardList[i]:SetActive(false)
end
for j = 1, #configData.RewardList do
local item = self.rewardList[j]
if not item then
item = newObjToParent(self.rewardPre,self.rewardGrid.transform)
self.rewardList[j] = item
if self.data.myPlaceId > 0 then
self.time:SetActive(true)
self.TextTip:SetActive(false)
self.rewardGrid:SetActive(true)
local configData = lodeConfig[self.data.myPlaceId]
for i = 1, #self.rewardList do
self.rewardList[i]:SetActive(false)
end
item:SetActive(true)
Util.GetGameObject(item,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.RewardList[j][1]))
Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( "%s/分",configData.RewardList[j][2])
for j = 1, #configData.RewardList do
local item = self.rewardList[j]
if not item then
item = newObjToParent(self.rewardPre,self.rewardGrid.transform)
self.rewardList[j] = item
end
item:SetActive(true)
Util.GetGameObject(item,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.RewardList[j][1]))
Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( "%s/分",configData.RewardList[j][2])
end
else
self.time:SetActive(false)
self.TextTip:SetActive(true)
self.rewardGrid:SetActive(false)
end
ForceRebuildLayout(self.bottom.transform)
end