diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab index 0a7db2edfb..5664ed71c2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab @@ -158,7 +158,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, y: -243.2} + m_AnchoredPosition: {x: 0, y: -243.19995} m_SizeDelta: {x: 0, y: -920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5399186556472212939 @@ -463,7 +463,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607844, g: 0.9607844, b: 0.80392164, a: 1} + m_Color: {r: 0.89019614, g: 0.8941177, b: 0.7607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -473,7 +473,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 36 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 100 @@ -543,7 +543,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.95686275, b: 0.8509804, a: 1} + m_Color: {r: 0.3254902, g: 0.21960786, b: 0.18039216, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1485,8 +1485,8 @@ 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: d02dfc06a777c3943b2c2e2427f9a736, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 464afd7231b8c804ead5c1664a4befc4, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1529,7 +1529,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: 387.5, y: -48.5} + m_AnchoredPosition: {x: 390, y: 66.7} m_SizeDelta: {x: 173, y: 43.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1817530621458675841 @@ -1574,8 +1574,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: 387.5, y: -5.32} - m_SizeDelta: {x: 153.49, y: 57.17} + m_AnchoredPosition: {x: 390, y: -27.6} + m_SizeDelta: {x: 195, y: 57.17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2155623684281556008 CanvasRenderer: @@ -1598,7 +1598,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8431373, g: 0.8470589, b: 0.8470589, a: 1} + m_Color: {r: 0.63529414, g: 0.5882353, b: 0.5568628, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1608,7 +1608,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 45 @@ -1696,7 +1696,7 @@ GameObject: m_Component: - component: {fileID: 7010905081362549579} - component: {fileID: 1406163323810710705} - - component: {fileID: 6914864598783075260} + - component: {fileID: 7032336005954173334} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -1718,10 +1718,10 @@ RectTransform: m_Father: {fileID: 3753356304809304800} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: -2.1} - m_SizeDelta: {x: 260, y: 146} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 219.6, y: -28} + m_SizeDelta: {x: 260, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1406163323810710705 CanvasRenderer: @@ -1731,7 +1731,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4568778334599513550} m_CullTransparentMesh: 0 ---- !u!114 &6914864598783075260 +--- !u!114 &7032336005954173334 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1740,26 +1740,31 @@ MonoBehaviour: m_GameObject: {fileID: 4568778334599513550} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Color: {r: 0.29803923, g: 0.19215688, b: 0.15294118, 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: a01bb0f08ae5e7148b659770e2d111fa, 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 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 35 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6838\u5FC3\u5956\u52B1\uFF1A" --- !u!1 &4668524331734147626 GameObject: m_ObjectHideFlags: 0 @@ -1994,7 +1999,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 30} + m_AnchoredPosition: {x: 0.000000061438165, y: 30} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4153919401695343612 @@ -2495,7 +2500,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: -407.5, y: -1.78} + m_AnchoredPosition: {x: -443.9, y: -1.78} m_SizeDelta: {x: 243.2, y: 142.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4056707442346350743 @@ -2565,7 +2570,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: 397.82, y: 9.3} + m_AnchoredPosition: {x: 390, y: -23.6} m_SizeDelta: {x: 195, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3233701052159668965 @@ -2596,7 +2601,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: 45827954022eed34e824dc6e56c0d293, type: 3} + m_Sprite: {fileID: 21300000, guid: e7842f74ba7bf7e498aa76e925ced625, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2976,7 +2981,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: 26.082, y: -0.5} + m_AnchoredPosition: {x: -3.1, y: -19.2} m_SizeDelta: {x: 474.57, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2363534577478212350 @@ -3036,7 +3041,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, y: 0.0000076293945} + m_AnchoredPosition: {x: 0, y: 6.3} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9141847805456898783 @@ -3069,11 +3074,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 30 + m_FontSize: 43 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index c417e6ed30..617fb54e85 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -34,8 +34,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: -367.49988, y: -25.46} - m_SizeDelta: {x: 345, y: 58.84} + m_AnchoredPosition: {x: -401.1, y: -25.46} + m_SizeDelta: {x: 277.8, y: 58.84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &786095124 CanvasRenderer: @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9686275, g: 0.9686275, b: 0.8117648, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -67,11 +67,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 52 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 52 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -110,7 +110,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6616730211952462317} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -315,8 +315,8 @@ 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: d02dfc06a777c3943b2c2e2427f9a736, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 4a5dfb8324c559e43b0d86f4ae3e4aff, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -453,7 +453,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4684089188661288290 RectTransform: m_ObjectHideFlags: 0 @@ -470,7 +470,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: 386, y: 42} + m_AnchoredPosition: {x: 386, y: 63.5} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8809243676872596007 @@ -494,7 +494,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9960785, g: 0.23137257, b: 0.31764707, a: 1} + m_Color: {r: 0.37254903, g: 0.21960786, b: 0.18039216, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -716,7 +716,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6616730211952462317} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -952,7 +952,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: -365, y: 44.6} + m_AnchoredPosition: {x: -403.6, y: 44.6} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6652958322775264559 @@ -976,7 +976,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9686275, g: 0.9686275, b: 0.8117648, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -986,7 +986,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 @@ -996,7 +996,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6218\u529B\u8FBE\u5230\u503C" + m_Text: "\u6218\u529B\u8FBE\u5230" LanguageIndex: 0 --- !u!1 &1756277438467989373 GameObject: @@ -1396,8 +1396,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: 17, y: 0} - m_SizeDelta: {x: 386.2, y: 137.7} + m_AnchoredPosition: {x: -19.41, y: -27.2} + m_SizeDelta: {x: 395.13, y: 111.84} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6899759931426735578 MonoBehaviour: @@ -1715,7 +1715,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.95686275, b: 0.8509804, a: 1} + m_Color: {r: 0.6313726, g: 0.5803922, b: 0.54901963, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1724,8 +1724,8 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 - m_FontStyle: 0 + m_FontSize: 45 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 @@ -2306,7 +2306,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: 45827954022eed34e824dc6e56c0d293, type: 3} + m_Sprite: {fileID: 21300000, guid: e7842f74ba7bf7e498aa76e925ced625, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2391,8 +2391,8 @@ MonoBehaviour: m_Padding: m_Left: 10 m_Right: 15 - m_Top: 5 - m_Bottom: 5 + m_Top: 0 + m_Bottom: 10 m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -2462,7 +2462,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7321620427203763959} - {fileID: 1435373470009693055} - {fileID: 2809572546770804754} - {fileID: 1365847374173356250} @@ -2541,7 +2540,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6616730211952462317} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2726,7 +2725,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2879,7 +2878,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -3050,7 +3049,7 @@ GameObject: m_Component: - component: {fileID: 9037527479546907407} - component: {fileID: 9037527479546907401} - - component: {fileID: 9037527479546907406} + - component: {fileID: 2271225024293583825} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -3074,8 +3073,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 345, y: 146} + m_AnchoredPosition: {x: 298.2, y: 58.4} + m_SizeDelta: {x: 345, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9037527479546907401 CanvasRenderer: @@ -3085,7 +3084,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9037527479546907404} m_CullTransparentMesh: 0 ---- !u!114 &9037527479546907406 +--- !u!114 &2271225024293583825 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3094,26 +3093,31 @@ MonoBehaviour: m_GameObject: {fileID: 9037527479546907404} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Color: {r: 0.3803922, g: 0.21960786, b: 0.18039216, 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: a01bb0f08ae5e7148b659770e2d111fa, 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 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 35 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5956\u52B1\u9884\u89C8\uFF1A" --- !u!1 &9216634848849289328 GameObject: m_ObjectHideFlags: 0 @@ -3207,138 +3211,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _textSpacing: -31.5 ---- !u!1001 &2363834050527081049 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6616730211952462317} - m_Modifications: - - target: {fileID: 3586961740586504043, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_Name - value: live2d_c_0002 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 246 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -681 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f87b57a840394684c8de29ed73ff613c, type: 3} ---- !u!224 &7321620427203763959 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4996067002232269998, guid: f87b57a840394684c8de29ed73ff613c, - type: 3} - m_PrefabInstance: {fileID: 2363834050527081049} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index dce48c8ea7..071e1cdf6c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -303,8 +303,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -1175.2} - m_SizeDelta: {x: 0, y: 992.2} + m_AnchoredPosition: {x: 0, y: -1144.81} + m_SizeDelta: {x: 0, y: 1052.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5399186556472212939 CanvasRenderer: @@ -596,7 +596,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8431373, g: 0.8470589, b: 0.8470589, a: 1} + m_Color: {r: 0.15686275, g: 0.19215688, b: 0.24705884, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -606,7 +606,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 - m_FontStyle: 2 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 @@ -645,7 +645,7 @@ RectTransform: m_GameObject: {fileID: 1553750013879696030} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalScale: {x: 1, y: 1, z: 0.8} m_Children: [] m_Father: {fileID: 1396680106514277842} m_RootOrder: 3 @@ -676,7 +676,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.96724814, b: 0.96724814, a: 1} + m_Color: {r: 0.92549026, g: 0.54509807, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -868,7 +868,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -500} + m_AnchoredPosition: {x: 0, y: -431.6} m_SizeDelta: {x: -0, y: 85.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4472731735553598297 @@ -1593,10 +1593,10 @@ RectTransform: m_Father: {fileID: 6241895497386724170} 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: -500, y: -1.37} - m_SizeDelta: {x: 260, y: 181.69} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -10.279999, y: 0} + m_SizeDelta: {x: 242.42, y: 200} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3977152365312893247 CanvasRenderer: @@ -1626,7 +1626,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: a01bb0f08ae5e7148b659770e2d111fa, type: 3} + m_Sprite: {fileID: 21300000, guid: 4fa0586995a61a34bb3fb8c80b059514, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1734,7 +1734,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -510} + m_AnchoredPosition: {x: 0, y: -441.60004} m_SizeDelta: {x: 736, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &618385539695001634 @@ -1846,8 +1846,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: -1700, y: -12.36} - m_SizeDelta: {x: 1000, y: 220} + m_AnchoredPosition: {x: -5276, y: -12.36} + m_SizeDelta: {x: 1000, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4468513620885537424 GameObject: @@ -2048,7 +2048,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: 305.7, y: -180} + m_AnchoredPosition: {x: 305.7, y: -171.5} m_SizeDelta: {x: 300, y: 48.15} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5939520279966165509 @@ -2072,7 +2072,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.91764706, b: 0.7764706, a: 1} + m_Color: {r: 0.12941177, g: 0.16470589, b: 0.22352943, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2160,7 +2160,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: d02dfc06a777c3943b2c2e2427f9a736, type: 3} + m_Sprite: {fileID: 21300000, guid: af59c769d221c25408299bb6f650578a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2455,7 +2455,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607844, g: 0.9607844, b: 0.80392164, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2927,7 +2927,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: 718.8, y: 61.9} + m_AnchoredPosition: {x: 725.7, y: 66.6} m_SizeDelta: {x: 158.87, y: 51.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5476576972710045244 @@ -2951,7 +2951,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.91764706, b: 0.7764706, a: 1} + m_Color: {r: 0.29411766, g: 0.18431373, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index a258d32a69..e89c24ff9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -15,13 +15,13 @@ local maxForce = 0 --顶部背景图 local titleBg = { --金币 - [1] = { bg = "z_zhaohuan_banner_01", titleImg = Language[10327], titleTip = GetLanguageStrById(specialConfig[41].Value), pos = Vector3.New(257.08, 658.37, 0) }, + [1] = { bg = "liwufubenBG", titleImg = Language[10327], titleTip = GetLanguageStrById(specialConfig[41].Value), pos = Vector3.New(257.08, 658.37, 0) }, --经验 - [2] = { bg = "r_richang_banner_4", titleImg = Language[10325], titleTip = GetLanguageStrById(specialConfig[42].Value), pos = Vector3.New(257.08, 651.24, 0) }, + [2] = { bg = "lingshoufubenBG", titleImg = Language[10325], titleTip = GetLanguageStrById(specialConfig[42].Value), pos = Vector3.New(257.08, 651.24, 0) }, --神将 - [3] = { bg = "z_zhaohuan_banner_03", titleImg = Language[10326], titleTip = GetLanguageStrById(specialConfig[43].Value), pos = Vector3.New(257.08, 658.37, 0) }, + [3] = { bg = "lingcaofubenBG", titleImg = Language[10326], titleTip = GetLanguageStrById(specialConfig[43].Value), pos = Vector3.New(257.08, 658.37, 0) }, --法宝 - [4] = { bg = "z_zhaohuan_banner_01", titleImg = GetLanguageStrById("法宝聚灵副本"), titleTip = GetLanguageStrById(specialConfig[44].Value), pos = Vector3.New(257.08, 651.24, 0) }, + [4] = { bg = "fabaofubenBG", titleImg = GetLanguageStrById("法宝聚灵副本"), titleTip = GetLanguageStrById(specialConfig[44].Value), pos = Vector3.New(257.08, 651.24, 0) }, --魂印 [5] = { bg = "r_richang_banner_1_zh", titleImg = Language[10329], titleTip = GetLanguageStrById(specialConfig[45].Value), pos = Vector3.New(257.08, 651.24, 0) }, }