【三界降魔】提交

dev_chengFeng
ZhangBiao 2021-10-28 16:03:23 +08:00
parent 04fff0d79b
commit 79f7339a3a
9 changed files with 101 additions and 63 deletions

View File

@ -289,6 +289,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6700\u591A\u516D\u4E2A\u5B57"
LanguageIndex: 0
--- !u!1 &805921966474949815
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6732348131763263724}
- component: {fileID: 2373439111272478510}
- component: {fileID: 6808925924377238998}
m_Layer: 0
m_Name: progress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6732348131763263724
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805921966474949815}
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: 5881481248584294052}
m_RootOrder: 3
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: 393, y: -48}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2373439111272478510
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805921966474949815}
m_CullTransparentMesh: 0
--- !u!114 &6808925924377238998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805921966474949815}
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.9764706, g: 0.8862745, b: 0.654902, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 10/10
LanguageIndex: 0
--- !u!1 &806124363427790407
GameObject:
m_ObjectHideFlags: 0
@ -664,6 +744,7 @@ RectTransform:
- {fileID: 7384004042993726190}
- {fileID: 2512810850551061970}
- {fileID: 9088330294412584900}
- {fileID: 6732348131763263724}
m_Father: {fileID: 8239412851497089739}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1245,7 +1326,6 @@ GameObject:
- component: {fileID: 8445872396402353808}
- component: {fileID: 522047702924648083}
- component: {fileID: 7741275312020652410}
- component: {fileID: 7768163539166236984}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
@ -1293,7 +1373,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5921569, g: 0.227451, b: 0.078431375, a: 1}
m_Color: {r: 0.97647065, g: 0.8862746, b: 0.654902, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1315,21 +1395,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u8DDD\u79BB\u4E0B\u6863\u5956\u52B1\u8FD8\u6709"
LanguageIndex: 0
--- !u!114 &7768163539166236984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4769333306697564595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.9622642, g: 0.89190996, b: 0.82155573, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &4904981934233573968
GameObject:
m_ObjectHideFlags: 0
@ -2159,7 +2224,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: 396, y: 0}
m_AnchoredPosition: {x: 396, y: 5}
m_SizeDelta: {x: 190, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7001042410689805739
@ -2460,7 +2525,6 @@ GameObject:
- component: {fileID: 1548575759258056059}
- component: {fileID: 1723389662064992090}
- component: {fileID: 3483733339174993630}
- component: {fileID: 8048840975818237082}
m_Layer: 0
m_Name: Tips
m_TagString: Untagged
@ -2508,7 +2572,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5921569, g: 0.227451, b: 0.078431375, a: 1}
m_Color: {r: 0.9764706, g: 0.8862745, b: 0.654902, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2530,21 +2594,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5DF2\u8FBE\u6210\u5168\u90E8\u76EE\u6807"
LanguageIndex: 0
--- !u!114 &8048840975818237082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7468895405210168136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.9622642, g: 0.89190996, b: 0.82155573, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &7541427593697655777
GameObject:
m_ObjectHideFlags: 0
@ -2589,7 +2638,6 @@ GameObject:
- component: {fileID: 2951951257659951333}
- component: {fileID: 7373045750117965884}
- component: {fileID: 2528781620268543002}
- component: {fileID: 4220556540580382561}
- component: {fileID: 616536318563961332}
m_Layer: 0
m_Name: Text (1)
@ -2638,7 +2686,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5921569, g: 0.227451, b: 0.078431375, a: 1}
m_Color: {r: 0.97647065, g: 0.8862746, b: 0.654902, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2660,21 +2708,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5C42"
LanguageIndex: 0
--- !u!114 &4220556540580382561
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7726708444879347323}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.9622642, g: 0.89190996, b: 0.82155573, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &616536318563961332
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -6842,10 +6842,10 @@ MonoBehaviour:
m_Padding:
m_Left: -45
m_Right: 0
m_Top: 0
m_Top: 80
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 160
m_ChildAlignment: 1
m_Spacing: 130
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -975,10 +975,10 @@ MonoBehaviour:
m_Padding:
m_Left: -45
m_Right: 0
m_Top: 0
m_Top: 80
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 160
m_ChildAlignment: 1
m_Spacing: 130
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -1784,6 +1784,7 @@ HELP_TYPE = {
FourQuadrant=108,--四象心法
YuJianXing=111,--御剑行
Cultivation=112,--主角修为
DemonSlayerNew=114,--新三界除魔
}
NumToComplexFont = {

View File

@ -48,7 +48,7 @@ function DemonSlayerNewPanel:BindEvent()
end)
Util.AddClick(this.helpBtn, function()
local pos = this.helpBtn.transform.localPosition
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.DemonSlayer, pos.x, pos.y)
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.DemonSlayerNew, pos.x, pos.y)
end)
Util.AddClick(this.btnRank, function()
if state == 0 then
@ -168,6 +168,9 @@ function DemonSlayerNewPanel:SingleDataShow(pre,data,index)
local level = Util.GetGameObject(pre,"Text"):GetComponent("Text")
local rewards = Util.GetGameObject(pre,"rewards")
local shows = data.otherData.Reward
local progress = Util.GetGameObject(pre,"progress"):GetComponent("Text")
progress.gameObject:SetActive(data.otherData.State == 1)
progress.text = string.format("%s/%s",data.progress,data.otherData.Values[1][2])
level.text = string.format("%s层",data.otherData.Values[1][2])
btnGet.sprite = this.spLoader:LoadSprite(btnState[data.otherData.State].Img)
@ -179,7 +182,7 @@ function DemonSlayerNewPanel:SingleDataShow(pre,data,index)
end
for i = 1, #shows do
if itemsGrid[pre][i] then
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.8,false,false,false,self.sortingOrder)
itemsGrid[pre][i].gameObject:SetActive(true)
end
end

View File

@ -217,6 +217,7 @@ function this.OnShowPanel()
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
CheckRedPointStatus(RedPointType.EpicExplore_LevleReward)
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
CheckRedPointStatus(RedPointType.DemonSlayerNew)
storeDataId,itemId,costNum = MonsterCampManager.MonsterCampGetCost()
this.titleText.text = Language[12099]
freeTimes = MonsterCampManager.GetCanBattleCount()

View File

@ -582,7 +582,7 @@ function this.DemonSlayerNewRedCheck()
end
end
end
return true
return false
end
return CommonActPageManager

View File

@ -289,7 +289,7 @@ function RewardEquipSingleShowPopup:OnShow()
end
end
end
this.equipProGridCom.spacing = 150
this.equipProGridCom.spacing = 130
if this.jumpViewList and #this.jumpViewList then
this.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,this.equipProGridCom.spacing*(#this.jumpViewList))
end

View File

@ -470,7 +470,7 @@ function RewardItemSingleShowPopup:OnShow()
end
end
this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600)
this.equipProGridCom.spacing = 150
this.equipProGridCom.spacing = 130
if jumpDataList and #jumpDataList then
this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList))
end