diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_zhujiemian_31.png b/Assets/ManagedResources/BG/UI/Guild/UI_zhujiemian_31.png index d92ed00b8c..0fe9d671d0 100644 Binary files a/Assets/ManagedResources/BG/UI/Guild/UI_zhujiemian_31.png and b/Assets/ManagedResources/BG/UI/Guild/UI_zhujiemian_31.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_01_qingluan_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_01_qingluan_t1.png index 6cca9860d4..2e446b5f3a 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_01_qingluan_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_01_qingluan_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_02_huodou_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_02_huodou_t1.png index 3237e72666..6aa03ba3c0 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_02_huodou_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_02_huodou_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_03_yinglong_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_03_yinglong_t1.png index 7d9283550b..785a43e5c0 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_03_yinglong_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_03_yinglong_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_04_zhulong_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_04_zhulong_t1.png index 1ca130c748..5342f99ffa 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_04_zhulong_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_04_zhulong_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_05_fenghuang_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_05_fenghuang_t1.png index 7db365e6e8..b2df45ffdc 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_05_fenghuang_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_05_fenghuang_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png index 6325525666..1bdae470ef 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png.meta b/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png.meta index 3f1c14a1af..e7346f5ed1 100644 --- a/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png.meta +++ b/Assets/ManagedResources/Icon/Pokemon/ls_06_baize_t1.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 05f47aaf44314fe4c892b133c31c59af + spriteID: bd733ca2e60a60e4884e00a954702499 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_07_jukun_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_07_jukun_t1.png index 681789bb18..4ac1c81c96 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_07_jukun_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_07_jukun_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png index 8117d38ad6..1d2b40e057 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png.meta b/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png.meta index c88bb49250..1b48243e10 100644 --- a/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png.meta +++ b/Assets/ManagedResources/Icon/Pokemon/ls_08_pixiu_t1.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 439649c662353c54080494fef51b6e46 + spriteID: 7b86c44cbf991614e9ff24765195d113 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Icon/Pokemon/ls_09_jinwu_t1.png b/Assets/ManagedResources/Icon/Pokemon/ls_09_jinwu_t1.png index e4035ef9c9..6a758c1e51 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/ls_09_jinwu_t1.png and b/Assets/ManagedResources/Icon/Pokemon/ls_09_jinwu_t1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_1.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_1.png index 8b0aac1978..c5414964b1 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_1.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_1.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_2.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_2.png index 1212f5be2c..d3f3deb967 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_2.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_2.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_3.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_3.png index d37bfd684d..9f04484b56 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_3.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_3.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_4.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_4.png index 1d879bd850..e488cdf5fd 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_4.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_4.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_5.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_5.png index 311c073657..f9fa69c5c6 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_5.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_5.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_6.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_6.png index c07fcd7524..31b462c03b 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_6.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_6.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png index 6688b6591d..b3616e0d75 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png.meta b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png.meta index 5e8fd1605e..4243741708 100644 --- a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png.meta +++ b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_7.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8846a3e77cfb90f49b43b6247905b053 + spriteID: e868be8ea72bf974aaa886bba67a8358 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_8.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_8.png index 11e57cb7bd..a701d2518c 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_8.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_8.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png index aa7847dd45..a8146dda99 100644 Binary files a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png and b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png differ diff --git a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png.meta b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png.meta index f6aea2b3d1..ad27415577 100644 --- a/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png.meta +++ b/Assets/ManagedResources/Icon/Pokemon/shengqi_da_9.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 66f0d8afa274f2a469729b7fdbcd36c6 + spriteID: 78fe5a26335c76b46aac3eabfb529e33 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 5646ba1c2c..3b9a1e7549 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -812,7 +812,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5723\u5668" + m_Text: "\u795E\u9F99" --- !u!114 &1006801141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -98765,12 +98765,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99005,12 +99005,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99230,12 +99230,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99320,12 +99320,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab index da5a4dc19f..9e70348c1d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab @@ -79,7 +79,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u5BC6\u5377" + m_Text: "\u795E\u9F99\u5BC6\u5377" --- !u!114 &223535537 MonoBehaviour: m_ObjectHideFlags: 0 @@ -417,7 +417,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u5206\u89E3" + m_Text: "\u795E\u9F99\u5206\u89E3" --- !u!114 &586208661 MonoBehaviour: m_ObjectHideFlags: 0 @@ -512,7 +512,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u5217\u8868" + m_Text: "\u795E\u9F99\u5217\u8868" --- !u!114 &601135007 MonoBehaviour: m_ObjectHideFlags: 0 @@ -903,7 +903,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u5546\u5E97" + m_Text: "\u795E\u9F99\u5546\u5E97" --- !u!114 &1479778418 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1072,7 +1072,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u53EC\u5524" + m_Text: "\u795E\u9F99\u53EC\u5524" --- !u!114 &1819971115 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index f89f076a99..cab7ca36b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -592,10 +592,10 @@ RectTransform: m_Father: {fileID: 6995400214349800738} 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: 52} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -33.600006} + m_SizeDelta: {x: 59, y: 52} m_Pivot: {x: 0, y: 0.5} --- !u!222 &284160509 CanvasRenderer: @@ -1167,7 +1167,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &772776595 RectTransform: m_ObjectHideFlags: 0 @@ -1715,10 +1715,10 @@ RectTransform: m_Father: {fileID: 8968305685718176642} 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: -81, y: 254} - m_SizeDelta: {x: 750, y: 71} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 378.2, y: -46.5} + m_SizeDelta: {x: 820.3, y: 90.899994} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1141191052 CanvasRenderer: @@ -1749,7 +1749,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1790,10 +1790,10 @@ RectTransform: m_Father: {fileID: 6995400214349800738} 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: 203, y: 0} - m_SizeDelta: {x: 0, y: 64.400024} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 203, y: -33.600006} + m_SizeDelta: {x: 288, y: 64.400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1301902053 CanvasRenderer: @@ -2204,9 +2204,9 @@ RectTransform: m_Father: {fileID: 7974999999455169579} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 151.84, y: -70.7} m_SizeDelta: {x: 148.07, y: 148.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1707913170 @@ -19442,8 +19442,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.9, y: -8.4} - m_SizeDelta: {x: 883.8, y: 618.9} + m_AnchoredPosition: {x: 15.66, y: -13.1} + m_SizeDelta: {x: 903.9, y: 628.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &413759009485613671 CanvasRenderer: @@ -19473,8 +19473,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: d93ad50a8a319c44c887d7e7743089a7, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -20429,9 +20429,9 @@ RectTransform: m_Father: {fileID: 7974999999455169579} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541.52, y: -70.7} m_SizeDelta: {x: 148.07, y: 148.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3021529376402532869 @@ -24362,7 +24362,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 15, y: -131} - m_SizeDelta: {x: 0, y: 67.20001} + m_SizeDelta: {x: 347, y: 67.20001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2227141160331573166 MonoBehaviour: @@ -25690,9 +25690,9 @@ RectTransform: m_Father: {fileID: 7974999999455169579} m_RootOrder: 3 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: 736.36, y: -70.7} m_SizeDelta: {x: 148.07, y: 148.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1261866771453240688 @@ -38119,7 +38119,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: 9.4, y: -147} + m_AnchoredPosition: {x: 9.399994, y: -147} m_SizeDelta: {x: 554.9, y: 146.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6010787729466236896 @@ -43982,9 +43982,9 @@ RectTransform: m_Father: {fileID: 7974999999455169579} 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: 346.68, y: -70.7} m_SizeDelta: {x: 148.07, y: 148.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8398721089673824485 @@ -49337,7 +49337,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: 410, y: 243} + m_AnchoredPosition: {x: 413, y: 253.7} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1975605273243877302 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5ae10fea2d..ec55dcbbda 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2843,8 +2843,8 @@ ExpeditionNodeType = { [18] = "坐骑", [19] = "宝器", [20] = "自选箱", - [21] = "圣器", - [22] = "圣器碎片碎片", + [21] = "神龙", + [22] = "神龙碎片碎片", [24] = "时装", [25] = "万能狗粮", [26] = "玲珑开门", diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index cbf99015ef..71c7762b9c 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -212,7 +212,7 @@ Language = { [10211] = GetLanguageStrById("第%d/%d回合"), [10212] = GetLanguageStrById("应用成功"), [10213] = GetLanguageStrById("应用失败"), - [10214] = GetLanguageStrById("圣器"), + [10214] = GetLanguageStrById("神龙"), [10215] = GetLanguageStrById("删除成功"), [10216] = GetLanguageStrById("30级后解锁"), [10217] = GetLanguageStrById("确认跳过战斗吗(%d秒)"), @@ -479,7 +479,7 @@ Language = { [10478] = GetLanguageStrById("1次"), [10479] = GetLanguageStrById("10次"), [10480] = GetLanguageStrById("剩余"), - [10481] = GetLanguageStrById("次必出圣器·"), + [10481] = GetLanguageStrById("次必出神龙·"), [10482] = GetLanguageStrById("宝阁值"), [10483] = GetLanguageStrById("今日召唤上限:"), [10484] = GetLanguageStrById("免费"), @@ -1415,10 +1415,10 @@ Language = { [11414] = GetLanguageStrById("星激活"), [11415] = GetLanguageStrById("(当前等级)"), [11416] = GetLanguageStrById("升星"), - [11417] = GetLanguageStrById("出战圣器无法进行重塑!"), - [11418] = GetLanguageStrById("未培养圣器无法进行重塑!"), + [11417] = GetLanguageStrById("出战神龙无法进行重塑!"), + [11418] = GetLanguageStrById("未培养神龙无法进行重塑!"), [11419] = GetLanguageStrById("重塑成功!"), - [11420] = GetLanguageStrById("当前无出战圣器!"), + [11420] = GetLanguageStrById("当前无出战神龙!"), [11421] = GetLanguageStrById("当前等级"), [11422] = GetLanguageStrById("下一等级"), [11423] = GetLanguageStrById("今日妖晶召唤次数不足!"), @@ -1433,26 +1433,26 @@ Language = { [11432] = GetLanguageStrById("基础属性"), [11433] = GetLanguageStrById("技能"), [11434] = GetLanguageStrById("升级要求"), - [11435] = GetLanguageStrById("圣器属性会平分给上阵的所有英雄"), + [11435] = GetLanguageStrById("神龙属性会平分给上阵的所有英雄"), [11436] = GetLanguageStrById("查看详情"), [11437] = GetLanguageStrById("】不足!"), - [11438] = GetLanguageStrById("圣器提升"), + [11438] = GetLanguageStrById("神龙提升"), [11439] = GetLanguageStrById("升星要求"), [11440] = GetLanguageStrById("属性加成:"), [11441] = GetLanguageStrById("技能:"), - [11442] = GetLanguageStrById("圣器羁绊"), - [11443] = GetLanguageStrById("获得下方所有圣器后激活图鉴属性"), + [11442] = GetLanguageStrById("神龙羁绊"), + [11443] = GetLanguageStrById("获得下方所有神龙后激活图鉴属性"), [11444] = GetLanguageStrById("羁绊属性[已激活]"), [11445] = GetLanguageStrById("羁绊属性[未激活]"), [11446] = GetLanguageStrById("成功激活羁绊【%s】!"), - [11447] = GetLanguageStrById("圣器列表"), - [11448] = GetLanguageStrById("未获得圣器"), - [11449] = GetLanguageStrById("未获得圣器碎片"), + [11447] = GetLanguageStrById("神龙列表"), + [11448] = GetLanguageStrById("未获得神龙"), + [11449] = GetLanguageStrById("未获得神龙碎片"), [11450] = GetLanguageStrById("已出战"), [11451] = GetLanguageStrById("休息中"), [11452] = GetLanguageStrById("碎片数量不足!"), - [11453] = GetLanguageStrById("选择出战圣器"), - [11454] = GetLanguageStrById("无可出战圣器!"), + [11453] = GetLanguageStrById("选择出战神龙"), + [11454] = GetLanguageStrById("无可出战神龙!"), [11455] = GetLanguageStrById("瑶池魇妖化作一阵青烟消失~~"), [11456] = GetLanguageStrById("本场战斗失败,是否保留双方当前状态,若不保留可以将双方重置为战斗初始时的状态?"), [11457] = GetLanguageStrById("保留"), @@ -1499,7 +1499,7 @@ Language = { [11498] = GetLanguageStrById("移除黑名单"), [11499] = GetLanguageStrById("黑名单"), [11500] = GetLanguageStrById("竞技场防守阵容:"), - [11501] = GetLanguageStrById("上阵圣器:"), + [11501] = GetLanguageStrById("上阵神龙:"), [11502] = GetLanguageStrById("申请成功!"), [11503] = GetLanguageStrById("黑名单列表已满"), [11504] = GetLanguageStrById("加入黑名单成功"), @@ -1563,20 +1563,20 @@ Language = { [11562] = GetLanguageStrById("解锁秘宝,可以领取额外专属奖励,并直接获得200积分,可获取1980妖晶,邮件领取"), [11563] = GetLanguageStrById("解锁秘宝,激活进阶专属奖励+直升15级,可获取1980妖晶,邮件领取"), [11564] = GetLanguageStrById("购买成功,请继续领取额外奖励!"), - [11565] = GetLanguageStrById("圣器选择"), - [11566] = GetLanguageStrById("请在下面列表中选择一个圣器抽取"), + [11565] = GetLanguageStrById("神龙选择"), + [11566] = GetLanguageStrById("请在下面列表中选择一个神龙抽取"), [11567] = GetLanguageStrById("/分钟"), [11568] = GetLanguageStrById("/分钟"), - [11569] = GetLanguageStrById("圣器重塑"), + [11569] = GetLanguageStrById("神龙重塑"), [11570] = GetLanguageStrById("重塑"), [11571] = GetLanguageStrById("确认花费  %s将%s重塑为初始状态,并100%s返还养成消耗"), [11572] = GetLanguageStrById("确认花费  %s将%s重塑为初始状态,并100%s返还养成消耗"), [11573] = GetLanguageStrById("确认分解"), [11574] = GetLanguageStrById("分解后获得"), [11575] = GetLanguageStrById("分解"), - [11576] = GetLanguageStrById("确认要分解所选的圣器或圣器碎片?"), + [11576] = GetLanguageStrById("确认要分解所选的神龙或神龙碎片?"), [11577] = GetLanguageStrById("出战加成"), - [11578] = GetLanguageStrById("出战圣器对英雄加成"), + [11578] = GetLanguageStrById("出战神龙对英雄加成"), [11579] = GetLanguageStrById("购买等级不能为0!"), [11580] = GetLanguageStrById("等级购买成功"), [11581] = GetLanguageStrById("已到达最大购买等级!"), @@ -1592,8 +1592,8 @@ Language = { [11591] = GetLanguageStrById("以上才可打开"), [11592] = GetLanguageStrById("确认花费%s钻石进行1次英雄召唤?"), [11593] = GetLanguageStrById("确认花费%s钻石进行10次英雄召唤?"), - [11594] = GetLanguageStrById("确认花费%s钻石进行1次圣器召唤?"), - [11595] = GetLanguageStrById("确认花费%s钻石进行10次圣器召唤?"), + [11594] = GetLanguageStrById("确认花费%s钻石进行1次神龙召唤?"), + [11595] = GetLanguageStrById("确认花费%s钻石进行10次神龙召唤?"), [11596] = GetLanguageStrById("确认花费%s钻石进行1次限时召唤?"), [11597] = GetLanguageStrById("确认花费%s钻石进行10次限时召唤?"), [11598] = GetLanguageStrById("确认花费%s钻石抽取1次乾坤宝盒?"), @@ -1709,10 +1709,10 @@ Language = { [11708] = GetLanguageStrById("首次十连必得五星英雄"), [11709] = GetLanguageStrById("幸运探宝"), [11710] = GetLanguageStrById("高级探宝"), - [11711] = GetLanguageStrById("金色圣器"), - [11712] = GetLanguageStrById("紫色圣器"), - [11713] = GetLanguageStrById("蓝色圣器"), - [11714] = GetLanguageStrById("圣器材料"), + [11711] = GetLanguageStrById("金色神龙"), + [11712] = GetLanguageStrById("紫色神龙"), + [11713] = GetLanguageStrById("蓝色神龙"), + [11714] = GetLanguageStrById("神龙材料"), [11715] = GetLanguageStrById("五星英雄"), [11716] = GetLanguageStrById("四星英雄"), [11717] = GetLanguageStrById("三星英雄"), @@ -1733,7 +1733,7 @@ Language = { [11732] = GetLanguageStrById("伙伴退役"), [11733] = GetLanguageStrById("英雄归元"), [11734] = GetLanguageStrById("生命卡归元"), - [11735] = GetLanguageStrById("圣器分解"), + [11735] = GetLanguageStrById("神龙分解"), [11736] = GetLanguageStrById("请选择需要退役的英雄!"), [11737] = GetLanguageStrById("最多选择%s个英雄!"), [11738] = GetLanguageStrById("此英雄已在"), @@ -1743,10 +1743,10 @@ Language = { [11742] = GetLanguageStrById("无可分解饰品!"), [11743] = GetLanguageStrById("请选择需要分解的饰品!"), [11744] = GetLanguageStrById("最多选择%s个饰品!"), - [11745] = GetLanguageStrById("无可分解圣器"), - [11746] = GetLanguageStrById("请选择圣器或圣器碎片"), - [11747] = GetLanguageStrById("最多选择%s个圣器"), - [11748] = GetLanguageStrById("无法同时选择圣器与圣器碎片!"), + [11745] = GetLanguageStrById("无可分解神龙"), + [11746] = GetLanguageStrById("请选择神龙或神龙碎片"), + [11747] = GetLanguageStrById("最多选择%s个神龙"), + [11748] = GetLanguageStrById("无法同时选择神龙与神龙碎片!"), [11749] = GetLanguageStrById("请选择一个需要归元的英雄!"), [11750] = GetLanguageStrById("请选择一个需要归元的英雄"), [11751] = GetLanguageStrById("请选择一个"), @@ -2248,7 +2248,7 @@ Language = { [12247] = GetLanguageStrById("一键装备"), [12248] = GetLanguageStrById("一键宝器"), [12249] = GetLanguageStrById("一键霸气"), - [12250] = GetLanguageStrById("一键圣器"), + [12250] = GetLanguageStrById("一键神龙"), [12251] = GetLanguageStrById("诸神"), [12252] = GetLanguageStrById("地煞"), [12253] = GetLanguageStrById("天罡"), @@ -2257,7 +2257,7 @@ Language = { [12256] = GetLanguageStrById("原价:%s元"), [12257] = GetLanguageStrById("现价:%s元"), [12258] = GetLanguageStrById("轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!"), - [12259] = GetLanguageStrById("每日可额外增加3次免费的圣器山招募机会,同时圣器山妖晶招募价格变为8折!"), + [12259] = GetLanguageStrById("每日可额外增加3次免费的神龙山招募机会,同时神龙山妖晶招募价格变为8折!"), [12260] = GetLanguageStrById("分解的霸气中包含金色或金色以上霸气,确定进行分解?"), [12261] = GetLanguageStrById("替 换"), [12262] = GetLanguageStrById("道具种类:%s"), @@ -2274,7 +2274,7 @@ Language = { [12273] = GetLanguageStrById("已取消骑乘!"), [12274] = GetLanguageStrById("英雄篇"), [12275] = GetLanguageStrById("霸气篇"), - [12276] = GetLanguageStrById("圣器篇"), + [12276] = GetLanguageStrById("神龙篇"), [12277] = GetLanguageStrById("激活属性:"), [12278] = GetLanguageStrById("激活成功,获得%s%s"), [12279] = GetLanguageStrById("破盾"), @@ -2292,9 +2292,9 @@ Language = { [12291] = GetLanguageStrById("是否前往称号界面?"), [12292] = GetLanguageStrById("今日剩余免费次数:%s"), [12293] = GetLanguageStrById("距排名结算:%s"), - [12294] = GetLanguageStrById("金色圣器或碎片"), - [12295] = GetLanguageStrById("紫色圣器或碎片"), - [12296] = GetLanguageStrById("蓝色圣器或碎片"), + [12294] = GetLanguageStrById("金色神龙或碎片"), + [12295] = GetLanguageStrById("紫色神龙或碎片"), + [12296] = GetLanguageStrById("蓝色神龙或碎片"), [12297] = GetLanguageStrById("其他道具"), [12298] = GetLanguageStrById("生命卡\n直升25级"), [12299] = GetLanguageStrById("剩余:%s"), diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index de2972cc56..49a305dcc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -15,9 +15,9 @@ local maxForce = 0 --顶部背景图 local titleBg={ --金币 - [1]={bg="LZH23", titleImg = "r_richang_banner_5_zi_zh",name="和之石副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)}, + [1]={bg="LZH23", titleImg = "r_richang_banner_5_zi_zh",name="神之力副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)}, --经验 - [2]={bg="LZH48", titleImg = "r_richang_banner_4_zi_zh",name="酒铁矿副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, + [2]={bg="LZH48", titleImg = "r_richang_banner_4_zi_zh",name="龙息副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, --神将 [3]={bg="r_richang_banner_3_zh", titleImg = "r_richang_banner_3_zi_zh", name="英雄副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, --法宝 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 3311470d75..2b9d0ebc48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -79,7 +79,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN, --日常 objName = "daily", nameImg = "f_fuben_fubenming_05", - name="魔人试炼", + name="神龙试炼", titleBg="UI_hz_fb_07", btnPos = Vector2(13,77), redPointType = RedPointType.HeroExplore, diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index d05e6b0a95..9f6c99d65a 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -179,7 +179,7 @@ function this:BuildRateData(actType,UpItem,upItemList) if m and m.Reward[1] == showData.monsterId then local _config = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,m.Reward[1]) local readingName = _config.ReadingName or _config.Name - table.insert(_upRateList,{id = m.Reward[1],tag="圣器UP!",name = readingName,value = m.WeightShow,color = "5B3B0B"}) + table.insert(_upRateList,{id = m.Reward[1],tag="神龙UP!",name = readingName,value = m.WeightShow,color = "5B3B0B"}) break end end @@ -369,9 +369,9 @@ function this:RefreshMonsterRate(UpMonster,_rateList) valueList1 = valueList1 - _rateList[i].value table.insert(rateList,_rateList[i]) end - table.insert(rateList,{tag="金色",name="金色圣器或碎片",value=valueList1,color = "BDB69C"}) - table.insert(rateList,{tag="紫色",name="紫色圣器或碎片",value=this:ReculateRate(list2),color = "BDB69C"}) - table.insert(rateList,{tag="蓝色",name="蓝色圣器或碎片",value=this:ReculateRate(list3),color = "BDB69C"}) + table.insert(rateList,{tag="金色",name="金色神龙或碎片",value=valueList1,color = "BDB69C"}) + table.insert(rateList,{tag="紫色",name="紫色神龙或碎片",value=this:ReculateRate(list2),color = "BDB69C"}) + table.insert(rateList,{tag="蓝色",name="蓝色神龙或碎片",value=this:ReculateRate(list3),color = "BDB69C"}) table.insert(rateList,{tag="其他",name="其他奖励",value=this:ReculateRate(list4),color = "BDB69C"}) return rateList end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index feedacff50..3e1ac68746 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -609,7 +609,7 @@ function RewardItemSingleShowPopup:OnShow() this.checkHeroText.text = "查看英雄" elseif rg and rg.ShowItem and itemConfigData.ItemType == ItemType.LingShouChip then this.checkHero:SetActive(true) - this.checkHeroText.text = "查看圣器" + this.checkHeroText.text = "查看神龙" elseif rg and rg.ShowItem and itemConfigData.ItemType == ItemType.GodWeaponChip then this.checkHero:SetActive(true) this.checkHeroText.text = "查看名刀" diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua index 3047f4f2cb..f5df72df8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua @@ -57,7 +57,7 @@ function this:OnShow(_parent,...) curMonsterId = _args[2] this.titleText.text=Language[11565] - this.tip.text = "长按头像可查看圣器详情" + this.tip.text = "长按头像可查看神龙详情" local monsterData = ConfigManager.GetAllConfigsDataByKey(ConfigName.SpiritAnimalSummon,"ActivityID",ActData.activityId)