diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png b/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png index 23033d8b10..f031ffa6e9 100644 Binary files a/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png and b/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_shezhi_shiyongzhong_zh.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_shezhi_shiyongzhong_zh.png index e29e252952..11ef67e101 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_shezhi_shiyongzhong_zh.png and b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_shezhi_shiyongzhong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_tongyong_yizhuangbei_zh.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_tongyong_yizhuangbei_zh.png index ec7d04d50d..c364c2b36d 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_tongyong_yizhuangbei_zh.png and b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/r_tongyong_yizhuangbei_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index b6e08ccf8e..479299a8f0 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -229,8 +229,8 @@ 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.09716797} - m_SizeDelta: {x: 0, y: -0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3713774413455505581 CanvasRenderer: @@ -500,7 +500,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.98, y: 2.89} - m_SizeDelta: {x: 258.98, y: 90} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6779763455156634555 CanvasRenderer: @@ -523,7 +523,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4117647, g: 0.84313726, b: 1, a: 1} + m_Color: {r: 0.67058825, g: 0.3921569, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -954,6 +954,7 @@ GameObject: - component: {fileID: 9084921967130511928} - component: {fileID: 8589139664405831713} - component: {fileID: 2335310645316213335} + - component: {fileID: 3712149346295991921} m_Layer: 5 m_Name: num m_TagString: Untagged @@ -975,10 +976,10 @@ RectTransform: m_Father: {fileID: 8467060635364585861} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -78} + m_SizeDelta: {x: 104, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8589139664405831713 CanvasRenderer: @@ -1001,7 +1002,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1022,6 +1023,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 2000 +--- !u!114 &3712149346295991921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 980519987099190710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1106207185316048076 GameObject: m_ObjectHideFlags: 0 @@ -6460,8 +6476,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: -269.5, y: -468.00003} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -258, y: -345.77} + m_SizeDelta: {x: 160, y: 36.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3840635568929308425 CanvasRenderer: @@ -6493,7 +6509,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -8590,7 +8606,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: -12, y: 6} + m_AnchoredPosition: {x: -1.4, y: 3.4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5292057743822194044 @@ -8600,7 +8616,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5271286813144385897} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -8611,7 +8627,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -10 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -8669,7 +8685,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: 247, y: -407.5} + m_AnchoredPosition: {x: 247, y: -419} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5748723079336325078 @@ -9241,7 +9257,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: -261.3, y: -401} + m_AnchoredPosition: {x: -261.3, y: -419} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2534790566426099267 @@ -9370,7 +9386,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: 6.8, y: 9.7} + m_AnchoredPosition: {x: 11.3, y: 5.6} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3697378015622646711 @@ -9380,7 +9396,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5673807414069377858} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9391,7 +9407,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -10 + m_Spacing: -5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -9876,10 +9892,10 @@ RectTransform: m_Father: {fileID: 8467060635364585861} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -54.5, y: -77.99999} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6088628336122041328 CanvasRenderer: @@ -10494,17 +10510,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6568671923275837422} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8467060635364585861} 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: 0, y: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 6, y: 3} + m_SizeDelta: {x: 280, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6403265139877489682 CanvasRenderer: @@ -10527,7 +10543,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} + m_Color: {r: 0.34117648, g: 0.21960786, b: 0.043137256, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -10536,18 +10552,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 48 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "10\u6B21" + m_Text: "\u5341\u8FDE\u53EC\u5524" LanguageIndex: 11457 --- !u!1 &6581121255130089159 GameObject: @@ -10921,10 +10937,10 @@ RectTransform: m_Father: {fileID: 8707505760031921771} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -24.100021, y: -76.70002} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &456025369945251173 CanvasRenderer: @@ -11128,7 +11144,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 14.71, y: 8} - m_SizeDelta: {x: 280, y: 85} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8071500978607586015 CanvasRenderer: @@ -11151,15 +11167,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9921569, g: 0.80392164, b: 0.16470589, 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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11316,6 +11332,7 @@ GameObject: - component: {fileID: 8198072785017622222} - component: {fileID: 2787941689728704253} - component: {fileID: 5542128597796752501} + - component: {fileID: 4377499846593317097} m_Layer: 5 m_Name: num m_TagString: Untagged @@ -11337,10 +11354,10 @@ RectTransform: m_Father: {fileID: 8707505760031921771} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.4, y: -76.70001} + m_SizeDelta: {x: 78, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2787941689728704253 CanvasRenderer: @@ -11363,7 +11380,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11384,6 +11401,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 220 +--- !u!114 &4377499846593317097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7466975135573526553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7634766337967253153 GameObject: m_ObjectHideFlags: 0 @@ -16262,17 +16294,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8143726029944677268} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8707505760031921771} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} + 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: 0, y: 0} + m_SizeDelta: {x: 280, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6789756586190126900 CanvasRenderer: @@ -16295,7 +16327,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 0.22352943, g: 0.11764707, b: 0.34509805, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -16304,18 +16336,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 52 + m_MinSize: 1 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1\u6B21" + m_Text: "\u5355\u6B21\u53EC\u5524" LanguageIndex: 11457 --- !u!1 &8159456579167926251 GameObject: @@ -16776,7 +16808,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: 4.6, y: -544} + m_AnchoredPosition: {x: 4.6, y: -567} m_SizeDelta: {x: 600, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3325518073787234455 diff --git a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab index c61a7b9999..de1b1ad559 100644 --- a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab @@ -775,7 +775,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4101560413708203383 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab index 79718b3c83..a12043dd51 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab @@ -35,7 +35,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: 41.2, y: -77} + m_AnchoredPosition: {x: 0, y: -77} m_SizeDelta: {x: 940, y: 58.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &25751776 @@ -68,18 +68,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 26 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6D3B \u52A8 \u5269 \u4F59 \u65F6 \u95F4\uFF1A2\u592908\u5C0F\u65F650\u5206" + m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A2\u592908\u5C0F\u65F650\u5206" --- !u!114 &2361161361799841452 MonoBehaviour: m_ObjectHideFlags: 0 @@ -278,7 +278,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: 7, y: -620} + m_AnchoredPosition: {x: 0, y: -620} m_SizeDelta: {x: 938, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &307776739 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab index a685c4c55b..7ca2c2640e 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/MissionPre.prefab @@ -378,7 +378,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: 244, y: 7} + m_AnchoredPosition: {x: 219.9, y: 7} m_SizeDelta: {x: 466.9, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2565642249346851103 @@ -931,8 +931,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: -58.3, y: 35} - m_SizeDelta: {x: 350.4, y: 70} + m_AnchoredPosition: {x: -33.3, y: 35} + m_SizeDelta: {x: 400.4, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5910249807746752427 CanvasRenderer: @@ -964,11 +964,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 45 - m_MaxSize: 50 + m_MinSize: 32 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -1028,7 +1028,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 529.2, y: 69} - m_SizeDelta: {x: 703.91, y: 140} + m_SizeDelta: {x: 683, y: 140} m_Pivot: {x: 1, y: 1} --- !u!222 &4175553623622581758 CanvasRenderer: @@ -2076,7 +2076,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 50 + m_Left: 30 m_Right: 0 m_Top: 0 m_Bottom: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 3de9ab70e5..3797519d5f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -26226,7 +26226,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3901352447422915093 RectTransform: m_ObjectHideFlags: 0 @@ -36910,7 +36910,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &252139921712663492 RectTransform: m_ObjectHideFlags: 0 @@ -56806,6 +56806,7 @@ GameObject: - component: {fileID: 4198242912804743013} - component: {fileID: 1299252007534824681} - component: {fileID: 940874928411970056} + - component: {fileID: 5503927228068882685} m_Layer: 5 m_Name: itemText m_TagString: Untagged @@ -56875,6 +56876,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 50 LanguageIndex: 10123 +--- !u!114 &5503927228068882685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646077006759241808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7661573695556620668 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab index 186768130e..3b646edd5d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab @@ -140,7 +140,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224548315728257952} - - {fileID: 1000461364720709120} - {fileID: 7041744091984222116} - {fileID: 3486540690740851400} m_Father: {fileID: 224104263369352388} @@ -191,10 +190,10 @@ RectTransform: m_Father: {fileID: 2114040022} 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: -1107, y: -7} - m_SizeDelta: {x: 3839.9998, y: 2160} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222544982504122848 CanvasRenderer: @@ -224,7 +223,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: bce8a843fbfebe946829d9ca617b4a87, type: 3} + m_Sprite: {fileID: 21300000, guid: e482df5cf13728147b11703a83956d62, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -262,13 +261,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2114040022} + - {fileID: 1000461364720709120} - {fileID: 8662176094448360883} - {fileID: 3682111438792279610} m_Father: {fileID: 0} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -20281,7 +20281,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114040022} - m_RootOrder: 3 + 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} @@ -20434,7 +20434,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 3.19, y: 1.59} - m_SizeDelta: {x: 260.84, y: 86.19} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1007451723941847846 CanvasRenderer: @@ -20457,7 +20457,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4117647, g: 0.84313726, b: 1, a: 1} + m_Color: {r: 0.67058825, g: 0.3921569, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -21245,7 +21245,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: 266.85, y: -421} + m_AnchoredPosition: {x: 266.85, y: -419} m_SizeDelta: {x: 388.5, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521175734626083417 @@ -36809,7 +36809,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114040022} - m_RootOrder: 2 + 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} @@ -38440,17 +38440,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3655946533620707762} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1153757584116525228} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7.7099886, y: 1} - m_SizeDelta: {x: 300.54, y: 80.47} + m_AnchoredPosition: {x: -7.7099886, y: 0} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &553444622712447160 CanvasRenderer: @@ -38482,7 +38482,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 44 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 @@ -38564,7 +38564,7 @@ RectTransform: - {fileID: 3542388914378049150} - {fileID: 1965169765554186566} m_Father: {fileID: 224104263369352388} - 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} @@ -60974,7 +60974,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3.71, y: 0.22056} - m_SizeDelta: {x: 258.57, y: 82.558} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2514029085181671913 CanvasRenderer: @@ -60997,15 +60997,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8117648, b: 0.16862746, 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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -85761,12 +85761,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7252455485238889055} - 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: 2964229123557174412} - m_Father: {fileID: 2114040022} + m_Father: {fileID: 224104263369352388} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -86525,7 +86525,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: -264.5, y: -425} + m_AnchoredPosition: {x: -264.5, y: -419} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9214746310570209805 @@ -101644,17 +101644,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8060940757564022063} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5318080413732577433} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -11, y: 1} - m_SizeDelta: {x: 311.68, y: 84.1} + m_AnchoredPosition: {x: -11, y: 0} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3754913180890023872 CanvasRenderer: @@ -101677,7 +101677,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.34509805, g: 0.22352943, b: 0.043137256, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -101686,7 +101686,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 44 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 @@ -112800,7 +112800,7 @@ RectTransform: - {fileID: 8792803733553372663} - {fileID: 5794699947938263759} m_Father: {fileID: 224104263369352388} - m_RootOrder: 1 + 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} diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index 2834bee6c1..246ae08b5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -11177,7 +11177,7 @@ RectTransform: m_GameObject: {fileID: 1953868093466511025} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 207968700750002960} m_RootOrder: 0 @@ -11185,7 +11185,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3.71, y: 0.22056} - m_SizeDelta: {x: 258.57, y: 82.558} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7623723054721704544 CanvasRenderer: @@ -11215,8 +11215,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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11260,7 +11260,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: 64, y: -568} + m_AnchoredPosition: {x: 64, y: -567} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7248933554773052511 @@ -11348,8 +11348,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: -264.5, y: -438} - m_SizeDelta: {x: 384, y: 112} + m_AnchoredPosition: {x: -264.5, y: -419} + m_SizeDelta: {x: 340, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3805011073443342724 CanvasRenderer: @@ -11762,17 +11762,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2662033592514119334} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.026176924, w: 0.99965733} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 207968700750002960} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -11, y: 1} - m_SizeDelta: {x: 311.68, y: 84.1} + m_AnchoredPosition: {x: -11, y: 0} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9165782087574592585 CanvasRenderer: @@ -11795,7 +11795,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.34509805, g: 0.22352941, b: 0.043137256, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -11804,7 +11804,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 44 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 @@ -21928,10 +21928,10 @@ RectTransform: m_Father: {fileID: 224104263369352388} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3792109124243788922 GameObject: @@ -37596,7 +37596,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: -0.0012417, y: 32.500008} + m_AnchoredPosition: {x: -0.0012417, y: 32.500137} m_SizeDelta: {x: 156.9, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6680648963269486201 @@ -37778,7 +37778,7 @@ RectTransform: m_GameObject: {fileID: 6499658092200846188} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6570118482368262949} m_RootOrder: 0 @@ -37786,7 +37786,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 3.19, y: 1.59} - m_SizeDelta: {x: 260.84, y: 86.19} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5103835783610824879 CanvasRenderer: @@ -37809,7 +37809,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.41037738, g: 0.8416442, b: 1, a: 1} + m_Color: {r: 0.67058825, g: 0.3921569, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -42614,8 +42614,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: 266.85, y: -434} - m_SizeDelta: {x: 388.5, y: 112} + m_AnchoredPosition: {x: 266.85, y: -419} + m_SizeDelta: {x: 340, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1247665718869932496 CanvasRenderer: @@ -58614,17 +58614,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8760573966297082427} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.026176924, w: 0.99965733} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6570118482368262949} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7.7099886, y: 1} - m_SizeDelta: {x: 300.54, y: 80.47} + m_AnchoredPosition: {x: -7.7099886, y: 0} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5512825306458913585 CanvasRenderer: @@ -58656,7 +58656,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 44 + m_FontSize: 50 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 @@ -58787,7 +58787,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -2.5499992, y: -191} + m_AnchoredPosition: {x: -2.5500488, y: -191} m_SizeDelta: {x: 901.5, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4543166409878565958 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 506d3bfd8e..2e16983c52 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -48490,13 +48490,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1255711233344344} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.03489949, w: 0.99939084} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224893614369775156} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -1} @@ -48523,7 +48523,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.121568635, g: 0.10196079, b: 0.08235294, a: 1} + m_Color: {r: 0.29411766, g: 0.15686275, b: 0.43921572, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -63264,7 +63264,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 275, y: 28.4} - m_SizeDelta: {x: 258, y: 100} + m_SizeDelta: {x: 280, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222107646204298368 CanvasRenderer: @@ -87710,8 +87710,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: -255, y: 28.400005} - m_SizeDelta: {x: 213, y: 100} + m_AnchoredPosition: {x: -275, y: 28.400005} + m_SizeDelta: {x: 280, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222844082346859594 CanvasRenderer: @@ -97391,8 +97391,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: 0, y: 27} - m_SizeDelta: {x: 258, y: 100} + m_AnchoredPosition: {x: 0, y: 28.4} + m_SizeDelta: {x: 280, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1189331336437135001 CanvasRenderer: @@ -182999,13 +182999,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238121541820277254} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.03489949, w: 0.99939084} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8795387183264503407} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -183032,7 +183032,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.121568635, g: 0.10196079, b: 0.08235294, a: 1} + m_Color: {r: 0.454902, g: 0.3137255, b: 0.121568635, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -193218,7 +193218,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: 44.47998, y: -51.60002} + m_AnchoredPosition: {x: 44.47998, y: -48.2} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3778598524646794727 @@ -193249,7 +193249,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: 02b8bbbaafb89d84a99da3dc5017a5aa, type: 3} + m_Sprite: {fileID: 21300000, guid: 708f848cd36fff5468b0e2a862044b52, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -193295,7 +193295,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: 0.000011772943} + m_AnchoredPosition: {x: 0, y: 0.000011740774} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7831612963117775310 @@ -198493,13 +198493,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4014989068251204221} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.03489949, w: 0.99939084} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224129801811890890} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 1} @@ -198526,7 +198526,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.121568635, g: 0.10196079, b: 0.08235294, a: 1} + m_Color: {r: 0.454902, g: 0.3137255, b: 0.121568635, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -222601,7 +222601,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 44 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua index add3c5cf8d..7d609b837b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua @@ -129,7 +129,7 @@ function this:SetIcon() Util.SetGray(this.sureBtn,false) this.fightBtnIcon.gameObject:SetActive(false) this.fightBtnNum.gameObject:SetActive(false) - this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01") + this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("X1_zhanling_pata_bt_03") this.tip.text = "奖励" if waveId == MonsterCampManager.monsterWave - 1 then if freeTime > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 530e178de7..6bf836ae6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -830,7 +830,7 @@ function this.BindRedPoint() -- BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) BindRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand) BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon) - --BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) + BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan) BindRedPointObject(RedPointType.GodWeapon,this.rpbtnXingYunTanBao) BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift) @@ -863,7 +863,7 @@ function this.ClearRedPoint() -- ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) ClearRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand) ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon) - --ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) + ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan) ClearRedPointObject(RedPointType.GodWeapon,this.rpbtnXingYunTanBao) ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)