送神祠星级修改

dev_chengFeng
jiaoyangna 2021-11-05 15:48:22 +08:00
parent f8b43c4c30
commit 1c2758f26c
7 changed files with 225 additions and 26 deletions

View File

@ -4189,6 +4189,7 @@ GameObject:
m_Component:
- component: {fileID: 2492555335493657461}
- component: {fileID: 7264707228109259493}
- component: {fileID: 1463406129850090696}
m_Layer: 5
m_Name: ItemListRoot
m_TagString: Untagged
@ -4223,6 +4224,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2819120374147908973}
m_CullTransparentMesh: 0
--- !u!114 &1463406129850090696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2819120374147908973}
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 &2854028092386135442
GameObject:
m_ObjectHideFlags: 0
@ -5980,6 +6010,7 @@ GameObject:
m_Component:
- component: {fileID: 4910242485821419028}
- component: {fileID: 3684918263632949848}
- component: {fileID: 1093422362649456572}
m_Layer: 5
m_Name: ItemListRoot
m_TagString: Untagged
@ -6014,6 +6045,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4431145364068676807}
m_CullTransparentMesh: 0
--- !u!114 &1093422362649456572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4431145364068676807}
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 &4480184209769585281
GameObject:
m_ObjectHideFlags: 0
@ -6642,7 +6702,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -7198,10 +7258,10 @@ RectTransform:
m_Father: {fileID: 235641477404672219}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 184.52998, y: -63.65}
m_SizeDelta: {x: 190, y: 58}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5004630570938477890
CanvasRenderer:
@ -8218,6 +8278,7 @@ GameObject:
m_Component:
- component: {fileID: 5403932856111560861}
- component: {fileID: 5403932856111560862}
- component: {fileID: 1662750947976081219}
m_Layer: 5
m_Name: ItemListRoot
m_TagString: Untagged
@ -8252,6 +8313,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403932856111560860}
m_CullTransparentMesh: 0
--- !u!114 &1662750947976081219
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403932856111560860}
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 &5403932856370853838
GameObject:
m_ObjectHideFlags: 0
@ -9983,7 +10073,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1508773176926603313
RectTransform:
m_ObjectHideFlags: 0
@ -10033,6 +10123,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7493297396072330528}
- component: {fileID: 7161690682615853999}
m_Layer: 5
m_Name: star
m_TagString: Untagged
@ -10059,6 +10150,29 @@ RectTransform:
m_AnchoredPosition: {x: -27.200073, y: -2.289856}
m_SizeDelta: {x: 142.16, y: 29.089996}
m_Pivot: {x: 0, y: 0}
--- !u!114 &7161690682615853999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5774851079038251242}
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 &5808127690274937458
GameObject:
m_ObjectHideFlags: 0
@ -15073,10 +15187,10 @@ RectTransform:
m_Father: {fileID: 235641477404672219}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 377.56998, y: -63.65}
m_SizeDelta: {x: 190, y: 58}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3769464419337462616
CanvasRenderer:
@ -15530,6 +15644,7 @@ GameObject:
m_Component:
- component: {fileID: 8120306587700567573}
- component: {fileID: 1609821383811113227}
- component: {fileID: 2244901784412925840}
m_Layer: 5
m_Name: ItemListRoot
m_TagString: Untagged
@ -15564,6 +15679,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8702982654703153435}
m_CullTransparentMesh: 0
--- !u!114 &2244901784412925840
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8702982654703153435}
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 &8713559114260582039
GameObject:
m_ObjectHideFlags: 0
@ -15649,6 +15793,7 @@ GameObject:
m_Component:
- component: {fileID: 121018265363263051}
- component: {fileID: 8550694524238033415}
- component: {fileID: 141218723707247498}
m_Layer: 5
m_Name: ItemListRoot
m_TagString: Untagged
@ -15683,6 +15828,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8716657455423796376}
m_CullTransparentMesh: 0
--- !u!114 &141218723707247498
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8716657455423796376}
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 &8722264005408772271
GameObject:
m_ObjectHideFlags: 0
@ -15766,6 +15940,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5673655264526685079}
- component: {fileID: 2267312691036561670}
m_Layer: 5
m_Name: star
m_TagString: Untagged
@ -15792,6 +15967,29 @@ RectTransform:
m_AnchoredPosition: {x: -23.200073, y: 1.8100815}
m_SizeDelta: {x: 142.16, y: 29.089996}
m_Pivot: {x: 0, y: 0}
--- !u!114 &2267312691036561670
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8747452094286943837}
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 &8774376236652444173
GameObject:
m_ObjectHideFlags: 0

View File

@ -91,11 +91,11 @@ function ResolvePanel:BindEvent()
print(Language[12153]..tabSortType)
if tabSortType == i-1 then
tabSortType = 0
this.contents[curIndex].view.SortTypeClick(0)--全部
this.contents[curIndex].view.SortTypeClick(this.sortingOrder,0)--全部
this.EndTabBtnSelect()
else
tabSortType = i-1
this.contents[curIndex].view.SortTypeClick(i-1)
this.contents[curIndex].view.SortTypeClick(this.sortingOrder,i-1)
this.EndTabBtnSelect(heroEndBtns[i])
end
PlayerManager.now_index = tabSortType

View File

@ -1,6 +1,7 @@
----- 献祭 -----
local this = {}
local sortingOrder=0
local sort = 0
local tabSortType = 0
local tarHero
local selectHeroData={}--选择的英雄list did = data
@ -72,14 +73,15 @@ end
function this:OnShow(...)
local args={...}
sort = args[1]
sortingOrder = PlayerManager.now_index or 0
this.SortTypeClick(sortingOrder,args[3],args[4])
this.SortTypeClick(sort,sortingOrder,args[3],args[4])
end
--展示数据
function this.SortTypeClick(_sortType,isTop,isAni)
LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
function this.SortTypeClick(sortingOrder,_sortType,isTop,isAni)
sort = sortingOrder
tabSortType=_sortType
selectHeroData={}
tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2)
@ -119,7 +121,7 @@ function this.SingleHeroDataShow(go,_heroData)
starSize = Vector2.New(60,57)
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(starGrid, sortingOrder + 1)
Util.SetParticleSortLayer(starGrid, sort + 1)
local choosed =Util.GetGameObject(_go.transform, "choosed")
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh")

View File

@ -65,15 +65,14 @@ end
function this:OnShow(...)
local args={...}
sortingOrder =0
sortingOrder = PlayerManager.now_index or 0
--LogGreen(PlayerManager.now_index)
this.SortTypeClick(sortingOrder,args[3],args[4])
this.SortTypeClick(0,sortingOrder,args[3],args[4])
end
--展示数据
function this.SortTypeClick(_sortType,isTop,isAni)
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
tabSortType=_sortType
selectEquipTreasureData={}
if tabSortType == 0 then

View File

@ -166,7 +166,7 @@ function this:BindEvent()
end
selectChipId = 0
oldChoosed = nil
this.SortTypeClick(sortingOrder)
this.SortTypeClick(0,sortingOrder)
end)
end)
end)
@ -182,11 +182,11 @@ function this:OnShow(...)
local args={...}
sortingOrder =0
this.chooseObjList = {}
this.SortTypeClick(sortingOrder,args[3],args[4])
this.SortTypeClick(0,sortingOrder,args[3],args[4])
end
--展示数据
function this.SortTypeClick(_sortType,isTop,isAni)
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
tabSortType=_sortType
selectHeroData={}
--所有灵兽数据

View File

@ -60,7 +60,7 @@ function this:OnShow(...)
sortType = PlayerManager.now_index or 0
--LogGreen(PlayerManager.now_index)
this.SortTypeClick(sortType,args[3],args[4])
this.SortTypeClick(sortingOrder,sortType,args[3],args[4])
end
function this:OnClose()
@ -75,7 +75,7 @@ end
--展示数据
function this.SortTypeClick(_sortType,isTop,isAni)
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
selectHeroData={}
tarHero={}

View File

@ -61,7 +61,7 @@ function this:OnShow(...)
--LogGreen(PlayerManager.now_index)
this.SortTypeClick(sortType,args[3],args[4])
this.SortTypeClick(sortingOrder,sortType,args[3],args[4])
end
function this:OnClose()
@ -76,7 +76,7 @@ end
--展示数据
function this.SortTypeClick(_sortType,isTop,isAni)
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
selectHeroData={}
tarHero={}