diff --git a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab index 13f14b9ab8..0ddc65d015 100644 --- a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab @@ -176,7 +176,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.07450981, g: 0.050980393, b: 0.21960784, a: 1} + m_Color: {r: 0.92549026, g: 0.7058824, b: 0.3019608, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -351,8 +351,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -96} - m_SizeDelta: {x: 630, y: 104} + m_AnchoredPosition: {x: 210, y: -95.05606} + m_SizeDelta: {x: 630, y: 102.510704} m_Pivot: {x: 0, y: 1} --- !u!222 &6339083899383863092 CanvasRenderer: @@ -673,10 +673,10 @@ RectTransform: m_Father: {fileID: 4618805618225555824} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: -52} - m_SizeDelta: {x: 0, y: 104} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 315, y: -51.255352} + m_SizeDelta: {x: 630, y: 102.510704} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &679222972578842702 CanvasRenderer: @@ -1583,10 +1583,10 @@ RectTransform: m_Father: {fileID: 8976742001973453074} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 285, y: -72.52803} + m_SizeDelta: {x: 150, y: 45.056065} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5236596434421259375 CanvasRenderer: @@ -1859,7 +1859,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 220} + m_SizeDelta: {x: 1080, y: 217.56677} m_Pivot: {x: 0, y: 1} --- !u!114 &3426632090113956222 MonoBehaviour: @@ -2637,8 +2637,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -53.5} - m_SizeDelta: {x: 590, y: 81} + m_AnchoredPosition: {x: 30, y: -52.755352} + m_SizeDelta: {x: 590, y: 79.510704} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8144131830369882174 CanvasRenderer: @@ -5155,8 +5155,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 315, y: -52} - m_SizeDelta: {x: 630, y: 104} + m_AnchoredPosition: {x: 315, y: -51.255352} + m_SizeDelta: {x: 630, y: 102.510704} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &486315462555762117 CanvasRenderer: @@ -6962,10 +6962,10 @@ RectTransform: m_Father: {fileID: 6588365804820767913} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 220} + m_SizeDelta: {x: 1080, y: 217.56677} m_Pivot: {x: 0, y: 1} --- !u!114 &3488125279789961732 MonoBehaviour: @@ -8636,7 +8636,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -96} + m_AnchoredPosition: {x: 210, y: -95.05606} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6255032517346133824 @@ -8991,10 +8991,10 @@ RectTransform: m_Father: {fileID: 8976742001973453074} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 210, y: 0} - m_SizeDelta: {x: 630, y: 104} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -95.05606} + m_SizeDelta: {x: 630, y: 102.510704} m_Pivot: {x: 0, y: 1} --- !u!222 &2998197339896892628 CanvasRenderer: @@ -10582,10 +10582,10 @@ RectTransform: m_Father: {fileID: 4124197968599732343} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 30, y: -53.5} - m_SizeDelta: {x: 590, y: 81} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -52.755352} + m_SizeDelta: {x: 590, y: 79.510704} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7207970127566543276 CanvasRenderer: @@ -11115,8 +11115,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 285, y: -73} - m_SizeDelta: {x: 150, y: 46} + m_AnchoredPosition: {x: 285, y: -72.52803} + m_SizeDelta: {x: 150, y: 45.056065} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &511685628851045373 CanvasRenderer: @@ -11714,9 +11714,9 @@ RectTransform: m_Father: {fileID: 8976742001973453074} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -95.05606} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8378343419617957357 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 3764dba621..dfdc8b776d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -1049,7 +1049,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2016998867503061672 RectTransform: m_ObjectHideFlags: 0 @@ -1900,7 +1900,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4402519637241816994 RectTransform: m_ObjectHideFlags: 0 @@ -2995,6 +2995,85 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &2394556727214640368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2579293923493022943} + - component: {fileID: 1803183948002720995} + - component: {fileID: 5017431482856560070} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2579293923493022943 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394556727214640368} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3211435045233781356} + m_RootOrder: 1 + 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: 24.7, y: -3} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1803183948002720995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394556727214640368} + m_CullTransparentMesh: 0 +--- !u!114 &5017431482856560070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2394556727214640368} + 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.028301895, g: 0.0271004, b: 0.0271004, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 5555 --- !u!1 &2396978955345574460 GameObject: m_ObjectHideFlags: 0 @@ -4490,6 +4569,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3890829186937804308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6298476595532044956} + - component: {fileID: 863074823959421031} + - component: {fileID: 6533947295746443201} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6298476595532044956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890829186937804308} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3211435045233781356} + m_RootOrder: 0 + 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: -38.299873, y: -2.9999695} + m_SizeDelta: {x: 57.8, y: 57.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &863074823959421031 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890829186937804308} + m_CullTransparentMesh: 0 +--- !u!114 &6533947295746443201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890829186937804308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 21300000, guid: 6ab496406ddae204cb85c440a7927f8d, type: 3} + 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 &3923106494198258566 GameObject: m_ObjectHideFlags: 0 @@ -5058,7 +5211,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 50, y: -0.000061035156} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 802.05, y: 516} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4872216247291729287 @@ -5259,6 +5412,7 @@ RectTransform: m_Children: - {fileID: 2718659130077590256} - {fileID: 4817321399013275606} + - {fileID: 3211435045233781356} m_Father: {fileID: 1072792645855031736} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5734,6 +5888,43 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5857152143122122081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3211435045233781356} + m_Layer: 5 + m_Name: goldAid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3211435045233781356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857152143122122081} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0010147095} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6298476595532044956} + - {fileID: 2579293923493022943} + m_Father: {fileID: 2552602033212121965} + 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, y: 49.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5867125640823682720 GameObject: m_ObjectHideFlags: 0 @@ -6859,7 +7050,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4080728017189381547 RectTransform: m_ObjectHideFlags: 0 @@ -7599,7 +7790,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4817321399013275606 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua index 7416da3ed9..b5f027c41f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua @@ -70,7 +70,8 @@ function this.SingleHelpAidDataShow(go,data) Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName)) Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = data.name Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text =GetLanguageStrById(itemConfig[data.type].Name).. "("..data.num.."/"..guildHelpConfig[1].RecourseTime[2]..")" - Util.GetGameObject(go, "okAid/progressbar/progress"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] + Util.GetGameObject(go, "okAid/progressbar/progress1"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] + Util.GetGameObject(go, "okAid/progressbar/progress2"):SetActive(false) local getRewardBtn = Util.GetGameObject(go, "okAid/getRewardBtn") local zongNum = guildHelpConfig[1].HelpTime[1] + guildHelpConfig[1].HelpTime[2] Util.GetGameObject(getRewardBtn, "goldAid"):SetActive(MyGuildManager.MyFeteInfo.guildHelpTime >= guildHelpConfig[1].HelpTime[1] and MyGuildManager.MyFeteInfo.guildHelpTime < zongNum)