【命格】提交

dev_chengFeng
ZhangBiao 2021-12-10 11:40:15 +08:00
parent bab62f274c
commit f067ae5080
5 changed files with 211 additions and 22 deletions

View File

@ -1716,7 +1716,7 @@ RectTransform:
- {fileID: 2158910855521724454}
- {fileID: 4649730922482534687}
m_Father: {fileID: 4108176206694323356}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -2202,6 +2202,86 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &2568514345334669289
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 875733938960937372}
- component: {fileID: 2827032060168487959}
- component: {fileID: 518482488473935288}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &875733938960937372
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568514345334669289}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2609566871120678296}
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, y: 0}
m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2827032060168487959
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568514345334669289}
m_CullTransparentMesh: 0
--- !u!114 &518482488473935288
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568514345334669289}
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: 1, g: 0.92758536, b: 0.6273585, 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: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u653B\u51FB\u547D\u683C"
LanguageIndex: 0
--- !u!1 &2740058438398585959
GameObject:
m_ObjectHideFlags: 0
@ -3005,6 +3085,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2609566871120678296}
- {fileID: 7009261088902463386}
- {fileID: 4060167393088337132}
- {fileID: 1488316141863057836}
@ -5602,7 +5683,7 @@ RectTransform:
- {fileID: 2614927849387940298}
- {fileID: 3532584281394091202}
m_Father: {fileID: 4108176206694323356}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -6293,7 +6374,7 @@ RectTransform:
- {fileID: 1752280563168100482}
- {fileID: 7071899314877460569}
m_Father: {fileID: 4108176206694323356}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -8097,6 +8178,102 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8242953438176398710
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2609566871120678296}
- component: {fileID: 1631772771752127087}
- component: {fileID: 2450565560776186865}
- component: {fileID: 7710471947076363711}
m_Layer: 5
m_Name: Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2609566871120678296
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8242953438176398710}
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: 875733938960937372}
m_Father: {fileID: 4108176206694323356}
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: -15, y: 172}
m_SizeDelta: {x: 400, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1631772771752127087
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8242953438176398710}
m_CullTransparentMesh: 0
--- !u!114 &2450565560776186865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8242953438176398710}
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: e1cde786b05a9c449b547ab4669debb8, 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 &7710471947076363711
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8242953438176398710}
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 &8382124872255931040
GameObject:
m_ObjectHideFlags: 0

View File

@ -249,11 +249,11 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."SurpriseBoxPatFaceDay"..ActData.value) == 0 then
table.insert(patFaceAllData,v)
end
elseif v.Type == 15 then--特惠神装活动
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TeHuiShenZhuang)
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
table.insert(patFaceAllData,v)
end
-- elseif v.Type == 15 then--特惠神装活动(活动已经移除)
-- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TeHuiShenZhuang)
-- if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
-- table.insert(patFaceAllData,v)
-- end
else
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
table.insert(patFaceAllData,v)

View File

@ -76,6 +76,22 @@ function this.GetAllAttri()
return data
end
function this.GetSortAttri()
local tempData = {}
local data = this.GetAllAttri()
for key, value in pairs(data) do
local t = {}
t.id = key
t.num = value
t.sort = propertyConfig[key].SortId
table.insert( tempData,t )
end
table.sort(tempData,function (a,b)
return a.sort < b.sort
end )
return tempData
end
--========================一键合成============================
--获取表中所有命石(data[类型1-8][等级1-10]=表数据)组成map
function this.GetMapOfBagData()

View File

@ -22,6 +22,7 @@ function Gem:InitComponent()
--Gems
self.gems = Util.GetGameObject(self.gameObject, "Gems")
self.stones = Util.GetGameObject(self.gameObject, "Stones")
self.gemName = Util.GetGameObject(self.gameObject, "Stones/Name/Text"):GetComponent("Text")
self.itemList = {}
self.propertyList = {}
@ -36,7 +37,7 @@ end
function Gem:BindEvent()
--帮助按钮
Util.AddClick(self.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y)
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Gem, self.helpPosition.x,self.helpPosition.y)
end)
Util.AddClick(self.btnPractice, function()
@ -47,7 +48,12 @@ function Gem:BindEvent()
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Gem, self.helpPosition.x,self.helpPosition.y)
end)
Util.AddClick(self.additionBtn, function()
UIManager.OpenPanel(UIName.GeneralInfoPopup, GENERALINFO_TYPE.Gem)
local tempData = GemManager.GetSortAttri()
if #tempData > 0 then
UIManager.OpenPanel(UIName.GeneralInfoPopup, GENERALINFO_TYPE.Gem)
else
PopupTipPanel.ShowTip("尚无命格属性加成!")
end
end)
end
@ -128,6 +134,7 @@ function Gem:SetStones(_data,index)
LogWarn("无数据")
end
local data = _data
self.gemName.text = typeName[index].."命格"
for i = 1, 3 do
local stoneGo = Util.GetGameObject(self.stones,"Stone ("..i..")")
local item = Util.GetGameObject(stoneGo,"Item")

View File

@ -34,18 +34,7 @@ function this:OnShow(_parent,...)
end
function this:Refresh()
local tempData = {}
local data = GemManager.GetAllAttri()
for key, value in pairs(data) do
local t = {}
t.id = key
t.num = value
t.sort = propertyConfig[key].SortId
table.insert( tempData,t )
end
table.sort(tempData,function (a,b)
return a.sort < b.sort
end )
local tempData = GemManager.GetSortAttri()
for key, value in pairs(self.itemList) do
value:SetActive(false)
end