From beee0ed0b32219d46f297cc1df7290b1334331b1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 13:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91=E6=97=A0?= =?UTF-8?q?=E5=B0=BD=E5=89=AF=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/EndLessCarbonPanel.prefab | 230 ++---------------- .../Modules/Carbon/EndLessCarbonPanel.lua | 9 +- 2 files changed, 21 insertions(+), 218 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab index 8354a22164..337c819c31 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab @@ -30,6 +30,7 @@ RectTransform: m_Children: - {fileID: 4365605484255408045} - {fileID: 2504269710646939200} + - {fileID: 8132533325127252831} - {fileID: 7374009446407492197} m_Father: {fileID: 7718438683870229994} m_RootOrder: 1 @@ -195,85 +196,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &952904002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 952904003} - - component: {fileID: 952904005} - - component: {fileID: 952904004} - m_Layer: 5 - m_Name: total - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &952904003 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 952904002} - 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: [] - m_Father: {fileID: 8132533325127252831} - 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: 91.9, y: 1.3} - m_SizeDelta: {x: 171.55, y: 59.21} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &952904005 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 952904002} - m_CullTransparentMesh: 0 ---- !u!114 &952904004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 952904002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.627451, g: 0.69803923, b: 0.69803923, 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: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 0 - m_Text: 100 --- !u!1 &1008669641 GameObject: m_ObjectHideFlags: 0 @@ -746,7 +668,7 @@ GameObject: - component: {fileID: 8132533325127252831} - component: {fileID: 5224272919960919979} m_Layer: 5 - m_Name: bg + m_Name: energy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -759,23 +681,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 255978615319290818} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2586287778450188548} - {fileID: 1032463601789151751} - - {fileID: 460744687276555270} - - {fileID: 952904003} - {fileID: 3921217073352995077} - {fileID: 8493555471523306560} - {fileID: 1730342917540129652} - m_Father: {fileID: 3270518310955346662} - m_RootOrder: 0 + m_Father: {fileID: 223869069} + m_RootOrder: 2 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.000007748604, y: -9} + m_AnchoredPosition: {x: -309, y: -86} m_SizeDelta: {x: 276.5, y: 82.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5224272919960919979 @@ -896,7 +816,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8132533325127252831} - m_RootOrder: 5 + 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} @@ -1041,85 +961,6 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 ---- !u!1 &460744687276555269 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 460744687276555270} - - component: {fileID: 460744687276555264} - - component: {fileID: 460744687276555271} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &460744687276555270 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460744687276555269} - 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: [] - m_Father: {fileID: 8132533325127252831} - m_RootOrder: 2 - 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: -1.1, y: -0.000020981} - m_SizeDelta: {x: 71.49, y: 59.21} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &460744687276555264 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460744687276555269} - m_CullTransparentMesh: 0 ---- !u!114 &460744687276555271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460744687276555269} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.627451, g: 0.69803923, b: 0.69803923, 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: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 0 - m_Text: / --- !u!1 &580582350175461757 GameObject: m_ObjectHideFlags: 0 @@ -2068,7 +1909,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: -0.00006866455} + m_AnchoredPosition: {x: 0, y: -0.00006866455} m_SizeDelta: {x: 0, y: -0.000091553} m_Pivot: {x: 0.00000010803342, y: 0.9999999} --- !u!114 &2285424144751814410 @@ -2139,7 +1980,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8132533325127252831} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2612,42 +2453,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5475\u5475\u5475\u5475" LanguageIndex: 0 ---- !u!1 &5852188732315298163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3270518310955346662} - m_Layer: 5 - m_Name: stepRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3270518310955346662 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852188732315298163} - 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: 8132533325127252831} - m_Father: {fileID: 8836622965762268863} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 138.25, y: -168} - m_SizeDelta: {x: 276.5, y: 82.30005} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5852471101666577391 GameObject: m_ObjectHideFlags: 0 @@ -2759,9 +2564,8 @@ RectTransform: m_Children: - {fileID: 5548363885730490346} - {fileID: 5109539070876082704} - - {fileID: 5767502811904048683} - - {fileID: 3270518310955346662} - {fileID: 7007529880916501514} + - {fileID: 5767502811904048683} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3088,7 +2892,7 @@ RectTransform: m_Children: - {fileID: 1896117615679019432} m_Father: {fileID: 8132533325127252831} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3386,7 +3190,7 @@ RectTransform: - {fileID: 6452890474239320624} - {fileID: 5121372916787065789} m_Father: {fileID: 223869069} - m_RootOrder: 2 + 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} @@ -3540,11 +3344,11 @@ RectTransform: m_Children: - {fileID: 6801989314623094698} m_Father: {fileID: 8836622965762268863} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -55, y: -193} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -158, y: 748} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6655059897805515729 @@ -3743,7 +3547,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8836622965762268863} - 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} diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 5839eba76c..ba0e53c8f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -10,9 +10,9 @@ function EndLessCarbonPanel:InitComponent() this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") -- 显示行动力 - this.curValue = Util.GetGameObject(self.gameObject, "stepRoot/bg/energyInfo"):GetComponent("Text") - this.totalValue = Util.GetGameObject(self.gameObject, "stepRoot/bg/total"):GetComponent("Text") - this.btnBuy = Util.GetGameObject(self.gameObject, "stepRoot/bg/add") + this.energy = Util.GetGameObject(self.gameObject, "Bg/bg1/miniMap/tBottom/energy") + this.curValue = Util.GetGameObject(self.energy, "energyInfo"):GetComponent("Text") + this.btnBuy = Util.GetGameObject(self.energy, "add") -- 小地图 this.miniMap = Util.GetGameObject(self.gameObject, "Bg/bg1/miniMap"):GetComponent("Image") @@ -38,7 +38,7 @@ function EndLessCarbonPanel:InitComponent() this.helpPosition = this.helpBtn:GetComponent("RectTransform").localPosition -- 行动力刷新倒计时显示 - this.bgTime = Util.GetGameObject(self.gameObject, "stepRoot/bg/Bgtime") + this.bgTime = Util.GetGameObject(self.energy, "Bgtime") this.actCountTime = Util.GetGameObject(this.bgTime, "time"):GetComponent("Text") --红点 @@ -138,7 +138,6 @@ function this.InitActPowerShow() local color = curEnergy <= 5 and "FF0014FF" or "A0B2B2FF" local str = string.format("%s", color, tostring(curEnergy)) this.curValue.text = str .. " / " .. total - --this.totalValue.text = total end