diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_di_hong.png b/Assets/ManagedResources/DynamicAtlas/r_richang_di_hong.png index f6ca8ddd41..cf007e2257 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/r_richang_di_hong.png and b/Assets/ManagedResources/DynamicAtlas/r_richang_di_hong.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_di_lan.png b/Assets/ManagedResources/DynamicAtlas/r_richang_di_lan.png index f8c06f1838..080b4634fb 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/r_richang_di_lan.png and b/Assets/ManagedResources/DynamicAtlas/r_richang_di_lan.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_di_zi.png b/Assets/ManagedResources/DynamicAtlas/r_richang_di_zi.png index c02b09a32e..d71f21d3c0 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/r_richang_di_zi.png and b/Assets/ManagedResources/DynamicAtlas/r_richang_di_zi.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index 738a495640..25fbb4911b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -182,8 +182,7 @@ RectTransform: 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: 1396680106514277842} + m_Children: [] m_Father: {fileID: 3408442198697653928} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -220,7 +219,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 578016bcc0473ff47a2694b7d2c27b1e, type: 3} + m_Sprite: {fileID: 21300000, guid: 25025916eee472c4eafe9a90826e2999, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1060,80 +1059,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3762132556571998898 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1396680106514277842} - - component: {fileID: 3977152365312893247} - - component: {fileID: 2593034710158877452} - m_Layer: 5 - m_Name: BgQuality - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1396680106514277842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3762132556571998898} - 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: 575870043181212594} - 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: 0, y: 0} - m_SizeDelta: {x: 868, y: 188} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3977152365312893247 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3762132556571998898} - m_CullTransparentMesh: 0 ---- !u!114 &2593034710158877452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3762132556571998898} - 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: 25025916eee472c4eafe9a90826e2999, 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 &3822339229096693290 GameObject: m_ObjectHideFlags: 0 @@ -1224,6 +1149,7 @@ RectTransform: - {fileID: 1421105423562867200} - {fileID: 6403195048930280866} - {fileID: 6530197106428225390} + - {fileID: 1221379356726746056} - {fileID: 6706942462312295341} m_Father: {fileID: 575870042541593200} m_RootOrder: 0 @@ -1436,7 +1362,7 @@ 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: 255.57, y: -45} + m_AnchoredPosition: {x: 255.57, y: 34.5} m_SizeDelta: {x: 220.99, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5939520279966165509 @@ -1556,6 +1482,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5936955584551852515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221379356726746056} + - component: {fileID: 3839379867582039022} + - component: {fileID: 4920612628841753415} + m_Layer: 5 + m_Name: powerBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1221379356726746056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936955584551852515} + 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: 2800389897786691465} + m_Father: {fileID: 3408442198697653928} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 742.3, y: -79.2} + m_SizeDelta: {x: 218, y: 88} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3839379867582039022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936955584551852515} + m_CullTransparentMesh: 0 +--- !u!114 &4920612628841753415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936955584551852515} + 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: 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: 21300000, guid: 7f7cdabfab0b95c41828e1ddca64a2b6, 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 &6024333862272756716 GameObject: m_ObjectHideFlags: 0 @@ -1820,11 +1821,11 @@ RectTransform: - {fileID: 8797316285502679983} - {fileID: 6722162577798484104} m_Father: {fileID: 3408442198697653928} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 741.43, y: -93} + m_AnchoredPosition: {x: 741.43, y: -146.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5679312751743760484 @@ -2585,3 +2586,96 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9216634848849289328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2800389897786691465} + - component: {fileID: 6771443295095595619} + - component: {fileID: 2133704523853689736} + - component: {fileID: 4462502243278561089} + m_Layer: 5 + m_Name: value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2800389897786691465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9216634848849289328} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 1221379356726746056} + 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: 137, y: 1.9} + m_SizeDelta: {x: 602.86, y: 201.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6771443295095595619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9216634848849289328} + m_CullTransparentMesh: 0 +--- !u!114 &2133704523853689736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9216634848849289328} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 188 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 2.7 + m_Text: 3140210 +--- !u!114 &4462502243278561089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9216634848849289328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -31.5 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index ab863396f0..385b900a98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -187,10 +187,11 @@ end --设置滚动条数据 root根节点 data本地表数据 ldata 上一条数据 function this.SetData(root, data, ldata) local type=0 --0为未开启 1为挑战 2为扫荡 - local bgQuality=Util.GetGameObject(root,"BgQuality"):GetComponent("Image") + local bgQuality=Util.GetGameObject(root,"Bg"):GetComponent("Image") local title=Util.GetGameObject(root,"Title"):GetComponent("Image") local reward=Util.GetGameObject(root,"Reward") local tip=Util.GetGameObject(root,"Tip"):GetComponent("Text") + local power=Util.GetGameObject(root,"powerBtn/value"):GetComponent("Text") local goBtn=Util.GetGameObject(root,"GoBtn") local goBtnImage=goBtn:GetComponent("Image") local goBtnText=Util.GetGameObject(goBtn,"Text"):GetComponent("Text") @@ -246,18 +247,24 @@ function this.SetData(root, data, ldata) type=1 goBtnText.text=Language[10334] goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuangse") - tip.text=string.format(Language[10335],_power) + power.text = _power--string.format(Language[10335], _power) + power.transform.gameObject:SetActive(true) if CarbonManager.IsDailyCarbonPass(data.Id) then type=2 goBtnText.text=Language[10336] goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuise") tip.text=Language[10337] + tip.gameObject:SetActive(true) + power.transform.gameObject:SetActive(false) end else type=0 - tip.text=string.format(Language[10338],_power) + power.text = _power --string.format(Language[10338], _power) goBtnText.text=Language[10339] + tip.gameObject:SetActive(false) + power.transform.gameObject:SetActive(true) end + power.color = PlayerManager.maxForce >= _power and UIColor.WRITE or UIColor.RED --点击事件 Util.AddOnceClick(goBtn,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 2e985fb144..288d87b301 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -32,7 +32,7 @@ function this.InitTypeTaskList(_userMissionList) userMissionList.type = _userMissionList[i].type userMissionList.takeTimes = _userMissionList[i].takeTimes userMissionList.heroId = _userMissionList[i].heroId - LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) + -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) if not TypeTaskData[_userMissionList[i].type] then TypeTaskData[_userMissionList[i].type] = {} end