From 680b9564740ef5dd66c6caaa8ba5eb9df52c5864 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 20 Dec 2021 15:02:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=A3=B0=E6=9C=9B=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/ActivityMainPanel.lua | 3 +-- .../Modules/Recharge/View/EveryDayGiftNew.lua | 21 ++++++++++++------- .../Modules/Recharge/View/RechargeViewNew.lua | 21 ++++++++++++------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 8a2ba958d3..c7b37be884 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -138,14 +138,13 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change) this:ClosePanel() end end - Log("_CurPageIndex:".._CurPageIndex) end -- 打开,重新打开时回调 function ActivityMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Main) orginLayer = self.sortingOrder - LogGreen("_CurPageIndex OnShow:".._CurPageIndex) + Log("_CurPageIndex OnShow:".._CurPageIndex) if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then _CurPageIndex = #tabs end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 3d667cb845..3040470be2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -152,12 +152,17 @@ function EveryDayGiftNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -169,7 +174,7 @@ function EveryDayGiftNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -198,7 +203,7 @@ function EveryDayGiftNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -209,7 +214,7 @@ function EveryDayGiftNew:RefreshReward(Data) elseif DynamicActivityManager.curLevel + 1 > #growData then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 817e22622c..86ac6cfec0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -76,12 +76,17 @@ function RechargeViewNew:SetGrowGift() --计算当前声望等级 if DynamicActivityManager.curLevel == 0 then for i = 1, #growData do - if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then - DynamicActivityManager.curLevel = i - if DynamicActivityManager.Index == 0 then - DynamicActivityManager.Index = DynamicActivityManager.curLevel + if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then + if rechargeNum ~= 0 then + DynamicActivityManager.curLevel = i + if DynamicActivityManager.Index == 0 then + DynamicActivityManager.Index = DynamicActivityManager.curLevel + end + break + else + DynamicActivityManager.curLevel = 1 + DynamicActivityManager.Index = 1 end - break end end end @@ -93,7 +98,7 @@ function RechargeViewNew:SetGrowGift() end end - -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) + Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) @@ -122,7 +127,7 @@ function RechargeViewNew:RefreshReward(Data) if DynamicActivityManager.Index < 2 then num = growData[2].data.shopItemData.BuyRule[2] elseif DynamicActivityManager.Index + 1 > #growData then - text = #growData + text = #growData-1 num = growData[#growData].data.shopItemData.BuyRule[2] else text = DynamicActivityManager.Index-1 @@ -133,7 +138,7 @@ function RechargeViewNew:RefreshReward(Data) elseif DynamicActivityManager.curLevel + 1 > #growData then self.tip.text = "" else - self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel) + self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) end local size = rechargeNum/num From 12b980590fc9bca4ab7ab74b0674007836c95ba3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 20 Dec 2021 15:18:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=90=8D=E6=9C=9B=E3=80=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/EveryDayGiftNew.lua | 2 +- .../~Lua/Modules/Recharge/View/RechargeViewNew.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 3040470be2..8b7eab3d03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -211,7 +211,7 @@ function EveryDayGiftNew:RefreshReward(Data) end if DynamicActivityManager.curLevel <= 2 then self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum) - elseif DynamicActivityManager.curLevel + 1 > #growData then + elseif DynamicActivityManager.curLevel >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then self.tip.text = "" else self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 86ac6cfec0..6007aabd48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -135,7 +135,7 @@ function RechargeViewNew:RefreshReward(Data) end if DynamicActivityManager.curLevel <= 2 then self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum) - elseif DynamicActivityManager.curLevel + 1 > #growData then + elseif DynamicActivityManager.curLevel + 1 >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then self.tip.text = "" else self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1) From 885a6e2fa8e057e3c81768d26a6fcfbc03e59cdf Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 20 Dec 2021 15:32:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=E7=BB=93=E7=AE=97=E8=AE=B0=E5=BD=95=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=B5=E4=BA=A1=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_zhandou_zhenwang_zh.png | Bin 0 -> 5315 bytes .../ArtFont/r_zhandou_zhenwang_zh.png.meta | 110 ++++++++++++++++++ .../Prefabs/UI/Battle/DamageResult.prefab | 70 +++++------ .../Modules/Battle/View/DamageResultPanel.lua | 13 ++- 4 files changed, 151 insertions(+), 42 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png create mode 100644 Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..7cb0985a281d4512960e7a7a29d8abcc29d331f8 GIT binary patch literal 5315 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 VBQkwVk&*xa002ovPDHLkV1o6cAbtP< literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta new file mode 100644 index 0000000000..19f2649844 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ArenaAtlas/ArtFont/r_zhandou_zhenwang_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 063058bfcd8740144ae855e56d755855 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b3281f9d64d382a4487d6c1e6fea7022 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ArenaAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index f86e032a4c..93c02a3a43 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -902,7 +902,7 @@ GameObject: m_Component: - component: {fileID: 1749564513666807311} - component: {fileID: 5862088432759568500} - - component: {fileID: 5904280449735229110} + - component: {fileID: 6363807631240224676} m_Layer: 5 m_Name: deadObj m_TagString: Untagged @@ -926,8 +926,8 @@ 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: 14.285736, y: 19.857117} - m_SizeDelta: {x: 67.95, y: 30} + m_AnchoredPosition: {x: 50.999996, y: 20.5} + m_SizeDelta: {x: 46, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5862088432759568500 CanvasRenderer: @@ -937,7 +937,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2523366928776616017} m_CullTransparentMesh: 0 ---- !u!114 &5904280449735229110 +--- !u!114 &6363807631240224676 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -946,31 +946,26 @@ MonoBehaviour: m_GameObject: {fileID: 2523366928776616017} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u9635\u4EA1" + 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 &2658533052818541386 GameObject: m_ObjectHideFlags: 0 @@ -3334,7 +3329,7 @@ GameObject: m_Component: - component: {fileID: 1546476454649784244} - component: {fileID: 5473746922102607565} - - component: {fileID: 3892143291985174656} + - component: {fileID: 2251792143694466160} m_Layer: 5 m_Name: deadObj m_TagString: Untagged @@ -3358,8 +3353,8 @@ 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: 25.428543, y: 19.857117} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 50.000008, y: 19.857117} + m_SizeDelta: {x: 46, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5473746922102607565 CanvasRenderer: @@ -3369,7 +3364,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7381184559301326831} m_CullTransparentMesh: 0 ---- !u!114 &3892143291985174656 +--- !u!114 &2251792143694466160 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3378,31 +3373,26 @@ MonoBehaviour: m_GameObject: {fileID: 7381184559301326831} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u9635\u4EA1" + 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 &7384883381373111011 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 72ad8a8990..9e313c0140 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -340,6 +340,7 @@ function this.HeadAdapter(head,data,type) local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text") local starRoot = Util.GetGameObject(head, "star") local deadObj = Util.GetGameObject(head, "deadObj") + deadObj:GetComponent("Image").sprite=this.spLoader:LoadSprite("r_zhandou_zhenwang_zh") local aa=0 local frameStr="r_characterbg_goden" @@ -438,10 +439,18 @@ function this.HeadAdapter(head,data,type) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon)) end if data.isRealDead and (type==1 or type==2 or type==3) then - Util.SetGray(icon.gameObject ,true) + -- Util.SetGray(icon.gameObject ,true) + -- Util.SetGray(frame.gameObject ,true) + -- Util.SetGray(protoIcon.gameObject ,true) + -- Util.SetGray(starRoot.gameObject ,true) + Util.SetGray(head.gameObject ,true) deadObj:SetActive(true) else - Util.SetGray(icon.gameObject,false) + -- Util.SetGray(icon.gameObject,false) + -- Util.SetGray(frame.gameObject ,false) + -- Util.SetGray(starRoot.gameObject ,false) + -- Util.SetGray(protoIcon.gameObject ,false) + Util.SetGray(head.gameObject ,false) deadObj:SetActive(false) end end