灵兽星际显示修改提交

dev_one_discount
wangzhenxing 2023-09-15 13:56:38 +08:00
parent 883f9af02e
commit 049cebd574
16 changed files with 3311 additions and 22652 deletions

View File

@ -124,7 +124,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1016874156854376854
RectTransform:
m_ObjectHideFlags: 0
@ -1102,7 +1102,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2028442216281820147
RectTransform:
m_ObjectHideFlags: 0
@ -1598,6 +1598,8 @@ GameObject:
m_Component:
- component: {fileID: 395828500356168348}
- component: {fileID: 8985219016970813321}
- component: {fileID: 4196570622552757930}
- component: {fileID: 1146451184534598585}
m_Layer: 5
m_Name: starGrid
m_TagString: Untagged
@ -1622,7 +1624,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -33, y: -20.2}
m_SizeDelta: {x: 439.78, y: 50}
m_SizeDelta: {x: 439.8, y: 55.473}
m_Pivot: {x: 0, y: 0}
--- !u!114 &8985219016970813321
MonoBehaviour:
@ -1647,6 +1649,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!222 &4196570622552757930
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089532078063229006}
m_CullTransparentMesh: 0
--- !u!114 &1146451184534598585
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089532078063229006}
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 &2234547431686636827
GameObject:
m_ObjectHideFlags: 0
@ -5449,7 +5488,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2937635953175023364
RectTransform:
m_ObjectHideFlags: 0
@ -7161,6 +7200,8 @@ GameObject:
m_Component:
- component: {fileID: 8200868749550275046}
- component: {fileID: 4731505375007911913}
- component: {fileID: 343867644202201822}
- component: {fileID: 4836017272031396458}
m_Layer: 5
m_Name: starGrid
m_TagString: Untagged
@ -7210,6 +7251,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!222 &343867644202201822
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7516110971732077364}
m_CullTransparentMesh: 0
--- !u!114 &4836017272031396458
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7516110971732077364}
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 &7549839113353284866
GameObject:
m_ObjectHideFlags: 0

View File

@ -5031,7 +5031,7 @@ ParticleSystem:
--- !u!199 &6161296600376289645
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9639,7 +9639,7 @@ ParticleSystem:
--- !u!199 &59756889805270018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14548,7 +14548,7 @@ ParticleSystem:
--- !u!199 &7916180334150735545
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19244,7 +19244,7 @@ ParticleSystem:
--- !u!199 &5503823321525384283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24000,7 +24000,7 @@ ParticleSystem:
--- !u!199 &4916691389796769922
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28817,7 +28817,7 @@ ParticleSystem:
--- !u!199 &1414505259255914329
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33686,7 +33686,7 @@ ParticleSystem:
--- !u!199 &6422307625403123547
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39070,7 +39070,7 @@ ParticleSystem:
--- !u!199 &1400025155975925427
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43826,7 +43826,7 @@ ParticleSystem:
--- !u!199 &4831510537640750578
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -48895,7 +48895,7 @@ ParticleSystem:
--- !u!199 &8633862836829159329
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -53765,7 +53765,7 @@ ParticleSystem:
--- !u!199 &4418153599546468259
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -58610,7 +58610,7 @@ ParticleSystem:
--- !u!199 &7342976386636797569
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63467,7 +63467,7 @@ ParticleSystem:
--- !u!199 &4516937340914071059
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -68223,7 +68223,7 @@ ParticleSystem:
--- !u!199 &8963892905396374743
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -72979,7 +72979,7 @@ ParticleSystem:
--- !u!199 &4839916396504067651
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -78282,7 +78282,7 @@ ParticleSystem:
--- !u!199 &6303063314533469828
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -83194,7 +83194,7 @@ ParticleSystem:
--- !u!199 &9034940250895212068
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88068,7 +88068,7 @@ ParticleSystem:
--- !u!199 &5956058915726607661
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -93185,7 +93185,7 @@ ParticleSystem:
--- !u!199 &7405838385727253625
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -98172,7 +98172,7 @@ ParticleSystem:
--- !u!199 &9124968279657543650
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -102986,7 +102986,7 @@ ParticleSystem:
--- !u!199 &3722382354438345896
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -108236,7 +108236,7 @@ ParticleSystem:
--- !u!199 &8109865659571137481
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -112844,7 +112844,7 @@ ParticleSystem:
--- !u!199 &3911940764501548078
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -117674,7 +117674,7 @@ ParticleSystem:
--- !u!199 &8349144721388472380
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -117818,6 +117818,8 @@ GameObject:
- component: {fileID: 3961601705685232168}
- component: {fileID: 2400058610180506700}
- component: {fileID: 7353454077595841286}
- component: {fileID: 9053123556237320687}
- component: {fileID: 8888814391181179693}
m_Layer: 5
m_Name: sartAndLvLayout
m_TagString: Untagged
@ -117881,6 +117883,43 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!222 &9053123556237320687
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929130689057857931}
m_CullTransparentMesh: 0
--- !u!114 &8888814391181179693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929130689057857931}
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 &6972735919726179043
GameObject:
m_ObjectHideFlags: 0
@ -122652,7 +122691,7 @@ ParticleSystem:
--- !u!199 &8960217420646366679
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -127454,7 +127493,7 @@ ParticleSystem:
--- !u!199 &6022355083171636958
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -132316,7 +132355,7 @@ ParticleSystem:
--- !u!199 &856737006736916181
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -136998,7 +137037,7 @@ ParticleSystem:
--- !u!199 &1782083110015755476
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -141827,7 +141866,7 @@ ParticleSystem:
--- !u!199 &6808665946914951987
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -146737,7 +146776,7 @@ ParticleSystem:
--- !u!199 &1658338389721565212
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -395,7 +395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6630273786794472594
RectTransform:
m_ObjectHideFlags: 0
@ -5463,7 +5463,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}
@ -9798,7 +9798,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -12216,6 +12216,8 @@ GameObject:
m_Component:
- component: {fileID: 7493297396072330528}
- component: {fileID: 7161690682615853999}
- component: {fileID: 2271099830260740971}
- component: {fileID: 2409166747585559784}
m_Layer: 5
m_Name: star
m_TagString: Untagged
@ -12265,6 +12267,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!222 &2271099830260740971
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5774851079038251242}
m_CullTransparentMesh: 0
--- !u!114 &2409166747585559784
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: -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 &5808127690274937458
GameObject:
m_ObjectHideFlags: 0
@ -19720,7 +19759,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4456537145914281463
RectTransform:
m_ObjectHideFlags: 0

View File

@ -13,7 +13,7 @@ function PokemonGetInfoPopup:InitComponent()
this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack")
this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot")
this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text")
this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)")
this.starGrid = Util.GetGameObject(self.transform, "bg/starGrid")
--属性
for i = 0, 4 do
@ -67,7 +67,22 @@ function this.GetShowPanelData()
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
this.ShowPokemonLive(pokemonSData)
--星级
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonBackData.star,2,Vector2.New(60,60))
local starSize = Vector2.New(65,65)
local starSize = Vector2.New(32.5,32.5)
local starScale = -10
local starType=1
local star = pokemonBackData.star
if star>5 then
starType=3
star=pokemonBackData.star+6
starSize = Vector2.New(1.2,-30)
starScale = 0
else
starSize=Vector2.New(60,60)
--starScale = 7
end
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(this.starGrid, this.sortingOrder + 1)
--属性
local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
@ -109,7 +124,7 @@ function this.NoGetShowPanelData()
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
this.ShowPokemonLive(pokemonSData)
--星级
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))
SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))
--属性
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]

View File

@ -37,7 +37,7 @@ function PokemonInfoPanel:InitComponent()
this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
this.bg = Util.GetGameObject(self.gameObject, "bg")
this.starGrid = Util.GetGameObject(self.transform, "starGrid/starGrid(Clone)")
this.starGrid = Util.GetGameObject(self.transform, "starGrid")
this.nameInfo = Util.GetGameObject(self.transform, "nameInfo")
this.namne = Util.GetGameObject(self.transform, "nameInfo/nameText"):GetComponent("Text")
this.sortText = Util.GetGameObject(self.transform, "nameInfo/sortText")
@ -358,7 +358,23 @@ function this.UpdateHeroInfoData()
this.dragView.gameObject:SetActive(false)
end
local starSize = Vector2.New(65,65)
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, curPokemonData.star,1,starSize)
--PokemonManager.SetHeroStars(this.spLoader, this.starGrid, curPokemonData.star,1,starSize)
local starSize = Vector2.New(32.5,32.5)
local starScale = -10
local starType=1
local star = curPokemonData.star
if star>5 then
starType=3
star=curPokemonData.star+6
starSize = Vector2.New(1,2.2)
starScale = -10
else
starSize=Vector2.New(60,60)
--starScale = 7
end
LogError("star==="..star)
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale)
Util.SetParticleSortLayer(this.starGrid, this.sortingOrder + 1)
--SetHeroStars(this.spLoader, starGrid, heroData.star,1,nil,nil,Vector2.New(0,1))
--常规属性赋值
upZhenDidis = PokemonManager.GetAllPokemonFormationDids()

View File

@ -44,7 +44,7 @@ function PokemonMainPanel:InitComponent()
this.roleGrid=Util.GetGameObject(this.gameObject,"lineParent")
for i = 1, 6 do
PokemonList[i] = Util.GetGameObject(self.transform, "PokemonList/singlePokemon (".. i ..")/singlePokemon")
PokemonGoList[i] = Util.GetGameObject(PokemonList[i], "pokemon".. i)
PokemonGoList[i] = Util.GetGameObject(PokemonList[i], "pokemon"..i)
PokemonGoListRedPoin[i] = Util.GetGameObject(PokemonGoList[i], "redPoint")
Util.GetGameObject( PokemonGoList[i], "upZhenInfo/titleImage/sortText"):GetComponent("Text").text = i
Util.GetGameObject( PokemonGoList[i], "addInfo/addInfo/sortText"):GetComponent("Text").text = i
@ -161,6 +161,7 @@ end
function this.ShowSinglePokemonList(go,singleData,liveIndex)
local goParent = go.transform.parent.gameObject
goParent:SetActive(true)
LogError("liveindex===="..liveIndex)
local bgQuan = Util.GetGameObject(goParent, "bg/Image (1)")
local upZhenInfo = Util.GetGameObject(go, "upZhenInfo")
local addInfo = Util.GetGameObject(go, "addInfo")
@ -255,7 +256,21 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
local starSize = Vector2.New(65,65)
PokemonManager.SetHeroStars(this.spLoader, Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), curData.star,1,starSize)
local type=1
local starScale=1
local star=curData.star
LogError("curData.star====="..curData.star)
local starType=1
if star>5 then
starType=3
star=star+6
starSize = Vector2.New(1,-13)
starScale = 0
end
LogError("star==="..star)
--PokemonManager.SetHeroStars(this.spLoader, Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), star,type,starSize,starScale)
SetHeroStars(this.spLoader, Util.GetGameObject(go, "upZhenInfo/starGrid"), star,starType,starSize,starScale)
Util.SetParticleSortLayer(Util.GetGameObject(go, "upZhenInfo/starGrid/starGrid(Clone)"), this.sortingOrder + 3)
-- Util.AddOnceClick( Util.GetGameObject(go, "upZhenInfo/upZhenClick"), function()
-- UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonUpZhenDatas())
-- end)

View File

@ -66,6 +66,7 @@ function PokemonUpStarSuccessPanel:OnSortingOrderChange()
Util.AddParticleSortLayer(this.UI_Effect_choukaSSR, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.UI_Effect_choukaSR, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.UI_Effect_choukaR, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.starGrid, self.sortingOrder - orginLayer)
this.mask:GetComponent("Canvas").overrideSorting = true
this.mask:GetComponent("Canvas").sortingOrder = self.sortingOrder - 30
orginLayer = self.sortingOrder
@ -83,8 +84,21 @@ function PokemonUpStarSuccessPanel:OnOpen(_curPokemonData)
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
Vector3.one * curPokemonData.scale, Vector3.New(curPokemonData.position[1],curPokemonData.position[2],0))
SetHeroStars(this.spLoader, this.starGrid, curPokemonData.star,1,Vector2.New(60,60),-11,Vector2.New(0.5,0.5))
local starSize = Vector2.New(60,60)
local starScale = -10
local starType=1
local star = curPokemonData.star
if star>5 then
starType=3
star=curPokemonData.star+6
starSize = Vector2.New(1,2) --控制大小
starScale = -5 --控制距离
else
--starSize=Vector2.New(60,60)
--starScale = 7
end
SetHeroStars(this.spLoader, this.starGrid, star,starType,starSize,starScale,Vector2.New(0.5,0.5))
Util.AddParticleSortLayer(this.starGrid, self.sortingOrder+1)
this.heroName.text = GetLanguageStrById(curPokeponConfig.Name)
SetTextVerTial(this.heroName,Vector3.New(101.68,10,0))
--如果是最大等级

View File

@ -90,8 +90,27 @@ function this.OnShowData()
this.upStar:SetActive(true)
this.noUpStarText:SetActive(false)
end
SetHeroStars(this.spLoader, this.curStarGrid, curPokemonData.star,1,Vector2(50,50))
SetHeroStars(this.spLoader, this.nextStarGrid, curPokemonData.star + 1,1,Vector2(50,50))
local star=curPokemonData.star
local starSize=Vector2(50,50)
local type=1
if star>5 then
star=star+6
starSize = Vector2.New(1,-13)
type=3
end
local star2=curPokemonData.star+1
local starSize2=Vector2(50,50)
local type2=1
if star2>5 then
star2=star2+6
starSize2 = Vector2.New(1,-13)
type2=3
end
SetHeroStars(this.spLoader, this.curStarGrid, star,type,starSize)
SetHeroStars(this.spLoader, this.nextStarGrid, star2,type2,starSize2)
Util.SetParticleSortLayer(this.curStarGrid, sortingOrder + 1)
Util.SetParticleSortLayer(this.nextStarGrid,sortingOrder + 1)
this.curLvEnd.text = curUpStarConfig.StarPara / 100 .. "%"
this.nextLvEnd.text = nextUpStarConfig.StarPara / 100 .. "%"
@ -124,8 +143,11 @@ function this.OnShowData()
-- else
-- this.skillTip.text = "已满星"
-- end
local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
local upStarMaterialsData={}
if curUpStarConfig.ConsumeItemNum>0 then
upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
end
for i = 1, #curUpStarConfig.ConsumeRes do
table.insert(upStarMaterialsData,curUpStarConfig.ConsumeRes[i])
end
@ -139,7 +161,7 @@ function this.OnShowData()
local configMaterialNum = upStarMaterialsData[i][2]
SubUIManager.Open(SubUIConfig.ItemView, itemParent.transform):OnOpen(false, {configMaterialId,0}, 1.3)
local curMaterialBagNum = 0
if i == 1 then--需要的灵兽
if spiritAnimal[configMaterialId] then--需要的灵兽
curUpStarSelectPokemonData = {}
local NoUpLvPokemonData = PokemonManager.GetNoUpLvPokemonData(curPokemonData.id,curPokemonData.dynamicId)
curMaterialBagNum = LengthOfTable(NoUpLvPokemonData)
@ -149,7 +171,7 @@ function this.OnShowData()
table.insert(curUpStarSelectPokemonData,NoUpLvPokemonData[i].dynamicId)
end
end
elseif i >= 2 then--需要的材料
else--需要的材料
curMaterialBagNum = BagManager.GetItemCountById(upStarMaterialsData[i][1])
end
if curMaterialBagNum < configMaterialNum then

View File

@ -130,7 +130,16 @@ function this.SingPokemonDataShow(_go,_itemData)
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text = AllPokemonFormationDids[_itemData.dynamicId] and string.format("<color=#00FF06>%s</color>",Language[11450]) or string.format("<color=#FF0000>%s</color>",Language[11451])
local starSize = Vector2.New(50,50)
SetHeroStars(this.spLoader, Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
local grid=Util.GetGameObject(_go.transform, "star/starGrid")
local star=_itemData.star
local type=1
if star>5 then
star=star+6
starSize = Vector2.New(1,-13)
type=3
end
SetHeroStars(this.spLoader,grid ,star,type,starSize, -5,Vector2.New(0.5,0.5))
Util.AddParticleSortLayer(grid,sortingOrder+1)
Util.GetGameObject(_go.transform, "lv"):GetComponent("Text").fontSize = GetCurLanguage()~=2 and 30 or 25
Util.GetGameObject(_go.transform, "star"):GetComponent("Text").fontSize = GetCurLanguage()~=2 and 30 or 25
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()

View File

@ -79,7 +79,15 @@ function this.SingleItemDataShow(_go,_itemData)
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=GetLanguageStrById(itemConfig[_itemData.id].Name)
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
local starSize = Vector2.New(50,50)
SetHeroStars(this.spLoader, Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize,-5,Vector2.New(0.5,0.5))
local star=_itemData.star
local type=1
if star>5 then
star=star+6
starSize = Vector2.New(1,-13)
type=3
end
SetHeroStars(this.spLoader, Util.GetGameObject(_go.transform, "star/starGrid"), star,type,starSize,-5,Vector2.New(0.5,0.5))
Util.SetParticleSortLayer(Util.GetGameObject(_go.transform, "star/starGrid"),sortingOrder + 3)
Util.AddOnceClick(Util.GetGameObject(_go.transform,"upZhen"), function()
if curUpZhenPokemonData then
--替换 协议

View File

@ -471,7 +471,22 @@ function this.FormationAdapter(teamInfo)
if demonId then
local heroGo = Util.GetGameObject(this.Pokemons[i], "hero")
heroGo:SetActive(true)
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star)
local starSize = Vector2.New(35,35)
local star=hero.star
local type=1
local starScale = -10
if star>5 then
star=star+6
starSize = Vector2.New(0.8,-25)
starScale=-20
type=3
else
starScale=-15
end
local grid=Util.GetGameObject(heroGo, "starGrid")
SetHeroStars(this.spLoader, grid, star,type,starSize,starScale)
--SetHeroStars(this.spLoader,grid ,star,type,starSize, starScale,Vector2.New(0.5,1))
Util.AddParticleSortLayer(Util.GetGameObject(heroGo, "starGrid"),this.sortingOrder + 1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal, demonId)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(this.Pokemons[i], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
@ -505,7 +520,7 @@ function this.FormationAdapter(teamInfo)
LogError("hero.position=="..teamInfo.MagicSoldier[i].position)
local heroGo = Util.GetGameObject(this.Weapons[hero.position], "hero")
heroGo:SetActive(true)
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star)
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star,1)
local heroConfig = ConfigManager.GetConfigData(ConfigName.ShenBing, demonId)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(this.Weapons[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality))

View File

@ -180,7 +180,7 @@ end
function this:OnShow(...)
local args={...}
sortingOrder =0
sortingOrder =args[1]
this.chooseObjList = {}
this.SortTypeClick(0,sortingOrder,args[3],args[4])
end
@ -277,7 +277,16 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
-- formationMask:SetActive(false)
end
local starGrid = Util.GetGameObject(_go.transform, "star")
SetHeroStars(this.spLoader, starGrid, heroData.star,1,Vector2.New(32.5,32.5),-15)
local star=heroData.star
local type=1
local starSize=Vector2.New(32.5,32.5)
if star>5 then
star=star+6
starSize = Vector2.New(1,-13)
type=3
end
SetHeroStars(this.spLoader, starGrid,star,1,starSize,-15)
Util.SetParticleSortLayer(starGrid,sortingOrder+1)
local choosed =Util.GetGameObject(_go.transform, "choosed")
if heroData.ischip==1 then
choosed:SetActive(selectChipId==heroData.dynamicId)