神魂星星修改提交

dev_chengFeng
jiaoyangna 2021-11-05 17:13:49 +08:00
parent ad3b903209
commit bd8cd97bf3
7 changed files with 148 additions and 43 deletions

View File

@ -320,6 +320,7 @@ GameObject:
- component: {fileID: 134824311}
- component: {fileID: 134824314}
- component: {fileID: 2767435939076187884}
- component: {fileID: 8562262682098124306}
m_Layer: 5
m_Name: Root
m_TagString: Untagged
@ -387,6 +388,35 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &8562262682098124306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 134824310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
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: 0}
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!1 &147624192
GameObject:
m_ObjectHideFlags: 0

View File

@ -3112,6 +3112,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 224696880413766440}
- component: {fileID: 4885629945572809232}
m_Layer: 5
m_Name: StarsRoot
m_TagString: Untagged
@ -3138,6 +3139,29 @@ RectTransform:
m_AnchoredPosition: {x: 542.815, y: 1088.05}
m_SizeDelta: {x: 314.37, y: 100}
m_Pivot: {x: 0, y: 0}
--- !u!114 &4885629945572809232
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1727714659016246}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 6
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &1763846005688960
GameObject:
m_ObjectHideFlags: 0

View File

@ -1919,7 +1919,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2005066119450562098
RectTransform:
m_ObjectHideFlags: 0
@ -1937,7 +1937,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: -120, y: 0}
m_AnchoredPosition: {x: -249, y: -2}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8510374398240285551
@ -3927,7 +3927,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2608071434627749797
RectTransform:
m_ObjectHideFlags: 0
@ -3945,7 +3945,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: 200.7, y: 0}
m_AnchoredPosition: {x: 71.69997, y: -2.0000257}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3754279224188791574
@ -5145,7 +5145,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7331555338783168338
RectTransform:
m_ObjectHideFlags: 0
@ -5163,7 +5163,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: -279, y: 0}
m_AnchoredPosition: {x: -408.00003, y: -2.0000257}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8573121244709411806
@ -7347,9 +7347,9 @@ RectTransform:
m_Father: {fileID: 1621437758308571794}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1338952091669234339
@ -7377,7 +7377,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -10338,9 +10338,9 @@ RectTransform:
m_Father: {fileID: 3221207368412664991}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7560600264855051533
@ -10368,7 +10368,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -10923,6 +10923,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1234982380300886496}
- component: {fileID: 6509785456878080492}
- component: {fileID: 7201011803805425772}
m_Layer: 0
m_Name: demons
m_TagString: Untagged
@ -10959,9 +10961,46 @@ 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: -119, y: 392}
m_SizeDelta: {x: 710, y: 150}
m_AnchoredPosition: {x: 2.9, y: 392}
m_SizeDelta: {x: 966.7, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6509785456878080492
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4554888815100873129}
m_CullTransparentMesh: 0
--- !u!114 &7201011803805425772
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4554888815100873129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
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: 0}
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!1 &4564079246579687462
GameObject:
m_ObjectHideFlags: 0
@ -13466,9 +13505,9 @@ RectTransform:
m_Father: {fileID: 593533450149258851}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3063449156968493967
@ -13496,7 +13535,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -14117,9 +14156,9 @@ RectTransform:
m_Father: {fileID: 5257737294637307512}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3619999548640183167
@ -14147,7 +14186,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -14802,7 +14841,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5856546603786599294
RectTransform:
m_ObjectHideFlags: 0
@ -14820,7 +14859,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: 362, y: 0}
m_AnchoredPosition: {x: 232.99997, y: -2.0000257}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7530592446128316541
@ -17602,9 +17641,9 @@ RectTransform:
m_Father: {fileID: 9064099372872882177}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4944481755143313226
@ -17632,7 +17671,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -17818,9 +17857,9 @@ RectTransform:
m_Father: {fileID: 9030251489275668867}
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: -17.2, y: -57}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 57.8, y: 18}
m_SizeDelta: {x: 109, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4483069591046152485
@ -17848,7 +17887,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_ChildAlignment: 6
m_Spacing: -16
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
@ -18311,7 +18350,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4877304167162384655
RectTransform:
m_ObjectHideFlags: 0
@ -18329,7 +18368,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: 522, y: 0}
m_AnchoredPosition: {x: 392.99997, y: -2.0000257}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6370651456244402925
@ -20805,7 +20844,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1575724401256539814
RectTransform:
m_ObjectHideFlags: 0
@ -20823,7 +20862,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: 41, y: 0}
m_AnchoredPosition: {x: -88.00003, y: -2.0000257}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5482759906324705110

View File

@ -209,7 +209,7 @@ function this.ResetItemView(root,rewardRoot,itemList,max,scale,sortingOrder,type
itemList[root][1].gameObject:SetActive(true)
else
for i = 1, #data1 do
itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2],data1[i][3],data1[i][4]},scale,false,false,false,sortingOrder)
itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2],data1[i][3],data1[i][4],data1[i][5]},scale,false,false,false,sortingOrder)
itemList[root][i]:Reset({data1[i][1],data1[i][2]},ItemType.Hero,{false,true,true,true})
itemList[root][i].gameObject:SetActive(true)
end

View File

@ -78,6 +78,10 @@ function this:OnShow(_parent,...)
local args = {...}
dropList = args[1]
selectHeroData=args[2]
local curhero
for k,v in pairs(selectHeroData) do
curhero = v
end
this.root.transform:GetComponent("RectTransform"):DOAnchorPosX(0, 0)
this.titleText.text=Language[11609]
@ -87,7 +91,7 @@ function this:OnShow(_parent,...)
local _data={}
for i=1,#dropList do
_data[i] = {dropList[i].id,dropList[i].num,nil,dropList[i].star}
_data[i] = {dropList[i].id,dropList[i].num,nil,dropList[i].star,curhero.dynamicId}
end
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
table.sort(_data,function(a,b)

View File

@ -105,7 +105,6 @@ function this.RefreshPanel()
Util.GetGameObject(o,"ProIcon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName))
Util.GetGameObject(o,"Lv/Text"):GetComponent("Text").text=1
SetHeroStars(this.spLoader, Util.GetGameObject(o,"Star"),heroConfig[heroId].Star,1,Vector2.New(30,30),-8.21)
Util.SetParticleSortLayer(Util.GetGameObject(o,"Star"), self.sortingOrder + 1)
end
--每位英雄的描述信息 字符串组合到一个text组件中
local _strs=string.split(GetLanguageStrById(_curData[i].HeroDesc),"#") --切割成多个

View File

@ -368,7 +368,7 @@ function ItemView:SetEffectLayer(effectLayer)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_ItemView_saoguang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_WuCai_Kuang, effectLayer - self.EffectOrginLayerQu)
Util.SetParticleSortLayer(self.starGrid,effectLayer + 1)
self:SetFrameEffectLayer(effectLayer)
self.EffectOrginLayerQu = effectLayer
@ -452,7 +452,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.num:GetComponent("Text").text = PrintWanNum(itemNum)
--Util.ClearChild(self.starGrid.transform)
local star = _reward[4] or itemConfig[itemSId].HeroStar[2]
SetHeroStars(self.spLoader, self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
self.frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroConfigData.Quality,star))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfigData.Icon))
self.proImage.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfigData.PropertyName))
@ -462,7 +462,16 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,star)
end)
local did = _reward[5] or nil
local starType = 1
local tempHero = nil
if did then
tempHero = HeroManager.GetSingleHeroData(did)
star,starType = tempHero.GetStar(1)
end
SetHeroStars(self.spLoader, self.starGrid, star,starType,nil,-15)
if effectLayer > 0 then
Util.SetParticleSortLayer(self.starGrid,effectLayer + 1)
self.UI_Effect_Kuang_JinSe:SetActive(heroConfigData.Star == 5)
self.UI_Effect_Kuang_HongSe:SetActive(heroConfigData.Star == 6)
self.UI_effect_WuCai_Kuang:SetActive(heroConfigData.Quantity == 7)