diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/lingshou_lingshoumingzidi.png b/Assets/ManagedResources/Atlas/PokemonAtlas/lingshou_lingshoumingzidi.png index aba6f2b4af..854f4a9405 100644 Binary files a/Assets/ManagedResources/Atlas/PokemonAtlas/lingshou_lingshoumingzidi.png and b/Assets/ManagedResources/Atlas/PokemonAtlas/lingshou_lingshoumingzidi.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_1.png b/Assets/ManagedResources/Icons/shenbing_wuqi_1.png index 00310ecfe5..2d3e832954 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_1.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_1.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_2.png b/Assets/ManagedResources/Icons/shenbing_wuqi_2.png index 51bb8e976f..2140dd0dc4 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_2.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_2.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_3.png b/Assets/ManagedResources/Icons/shenbing_wuqi_3.png index f4b26d7c90..01d954f708 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_3.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_3.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_5.png b/Assets/ManagedResources/Icons/shenbing_wuqi_5.png index 01d954f708..71d1cc5b97 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_5.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_5.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_6.png b/Assets/ManagedResources/Icons/shenbing_wuqi_6.png index 27fe1b722d..1a4751f327 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_6.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_6.png differ diff --git a/Assets/ManagedResources/Icons/shenbing_wuqi_7.png b/Assets/ManagedResources/Icons/shenbing_wuqi_7.png index b6ef8fce65..69afb34d9c 100644 Binary files a/Assets/ManagedResources/Icons/shenbing_wuqi_7.png and b/Assets/ManagedResources/Icons/shenbing_wuqi_7.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab index f298ffa760..37130e92be 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab @@ -7685,7 +7685,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5206\u89E3\u795E\u5175" + m_Text: "\u5206\u89E3\u6B66\u5668" --- !u!114 &8592169194668723468 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16481,6 +16481,7 @@ GameObject: - component: {fileID: 7062106885523077191} - component: {fileID: 6757490895614425711} - component: {fileID: 6431271770787782582} + - component: {fileID: 2312393918913570160} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -16528,7 +16529,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -16550,6 +16551,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &2312393918913570160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832461599478700950} + 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 &1842030455774223866 GameObject: m_ObjectHideFlags: 0 @@ -16706,7 +16722,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u5175\u5546\u5E97" + m_Text: "\u6B66\u5668\u5546\u5E97" --- !u!114 &4627892457839321519 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44571,6 +44587,7 @@ GameObject: - component: {fileID: 4873139672859125468} - component: {fileID: 3892139062175625782} - component: {fileID: 5509671196025262294} + - component: {fileID: 5183975028787184851} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -44618,7 +44635,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -44640,6 +44657,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &5183975028787184851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4599754768965413284} + 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 &4609193937758677880 GameObject: m_ObjectHideFlags: 0 @@ -47831,7 +47863,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u5175\u56FE\u9274" + m_Text: "\u6B66\u5668\u56FE\u9274" --- !u!114 &3553838086989471692 MonoBehaviour: m_ObjectHideFlags: 0 @@ -47858,6 +47890,7 @@ GameObject: - component: {fileID: 3556504788193500636} - component: {fileID: 8951229497368962698} - component: {fileID: 3849850162088017951} + - component: {fileID: 5263480929348185648} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -47905,7 +47938,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -47927,6 +47960,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &5263480929348185648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497164200937630394} + 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 &5500755324305638279 GameObject: m_ObjectHideFlags: 0 @@ -53835,7 +53883,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u5175\u5408\u6210" + m_Text: "\u6B66\u5668\u5408\u6210" --- !u!114 &1416866161409901424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -53862,6 +53910,7 @@ GameObject: - component: {fileID: 8223531194526685572} - component: {fileID: 2899485571428233814} - component: {fileID: 5808188187552931980} + - component: {fileID: 7028947617980431328} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -53909,7 +53958,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -53931,6 +53980,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &7028947617980431328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5866810000998516015} + 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 &5871738444846507307 GameObject: m_ObjectHideFlags: 0 @@ -55136,6 +55200,7 @@ GameObject: - component: {fileID: 7671563295290987733} - component: {fileID: 335219394016739739} - component: {fileID: 1903765834843078484} + - component: {fileID: 4027554214809628954} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -55183,7 +55248,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -55205,6 +55270,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &4027554214809628954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6188460859916811641} + 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 &6193967563950069188 GameObject: m_ObjectHideFlags: 0 @@ -56132,6 +56212,7 @@ GameObject: - component: {fileID: 3122634161925718514} - component: {fileID: 3790739834337505269} - component: {fileID: 636671539956572957} + - component: {fileID: 1706439356907454208} m_Layer: 5 m_Name: nameText m_TagString: Untagged @@ -56179,7 +56260,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -56201,6 +56282,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &1706439356907454208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6460283383980783299} + 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 &6461061740360940808 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 3b9a1e7549..169e2ad212 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -153,7 +153,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u540D\u5200" + m_Text: "\u8D85\u7EA7\u6B66\u5668" --- !u!114 &402979864 MonoBehaviour: m_ObjectHideFlags: 0 @@ -863,7 +863,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 2.3} - m_SizeDelta: {x: 138, y: 122} + m_SizeDelta: {x: 150, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1219831020 CanvasRenderer: @@ -893,7 +893,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: 180b0a9340493004380b50e58a02d716, type: 3} + m_Sprite: {fileID: 21300000, guid: 3fd1c060dc782ed4381471f7523846f4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -98765,12 +98765,12 @@ PrefabInstance: 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 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99005,12 +99005,12 @@ PrefabInstance: 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 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99230,12 +99230,12 @@ PrefabInstance: 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 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -99320,12 +99320,12 @@ PrefabInstance: 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 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index ec55dcbbda..5e6efa130a 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2874,8 +2874,8 @@ ExpeditionNodeType = { [50] = "万能碎片", [51] = "神石", [52] = "置换卡", - [53] = "名刀", - [54] = "名刀碎片", + [53] = "超级武器", + [54] = "超级武器碎片", [55] = "法术", [56] = "礼物", } diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua index 41fbfb16c4..a3e08c75a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua @@ -12,7 +12,7 @@ function GodWeaponGetInfoPopup:InitComponent() this.spLoader = SpriteLoader.New() this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack") - Util.GetGameObject(self.transform, "bg/title"):GetComponent("Text").text="查看名刀" + Util.GetGameObject(self.transform, "bg/title"):GetComponent("Text").text="查看超级武器" this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot"):GetComponent("Image") this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text") this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)") diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua index 5495f929c0..bbcb2a4c60 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua @@ -179,11 +179,11 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function this.ResetBtnOnClick() if godwData.point>0 then - PopupTipPanel.ShowTip("上阵名刀无法进行重铸") + PopupTipPanel.ShowTip("上阵超级武器无法进行重铸") return end if godwData.lv==1 and godwData.star <= 0 then - PopupTipPanel.ShowTip("未强化名刀无法进行重铸") + PopupTipPanel.ShowTip("未强化超级武器无法进行重铸") return end diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua index d8e837091f..999f199b9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua @@ -6,7 +6,7 @@ local shenBingConfig = ConfigManager.GetConfig(ConfigName.ShenBing) local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10201] }, - --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "名刀" }, + --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级武器" }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} @@ -20,7 +20,7 @@ local redPointList = {} function this:InitComponent(gameObject) this.spLoader = SpriteLoader.New() this.ChipItemList={}--存储itemview 重复利用 - Util.GetGameObject(gameObject, "GodWeaponListPanel_List/name"):GetComponent("Text").text = "名刀列表" + Util.GetGameObject(gameObject, "GodWeaponListPanel_List/name"):GetComponent("Text").text = "超级武器列表" this.tabBox = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/TabBox") this.ScrollParentView1 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ScrollParentView1") @@ -97,7 +97,7 @@ function this.OnClickTabBtn(_curIndex) this.SingPokemonDataShow(go, pokemonList[index]) end) this.NoneImage:SetActive(#pokemonList <= 0) - this.NoneImageText.text = "未获得名刀" + this.NoneImageText.text = "未获得超级武器" elseif curIndex == 1 then this.ScrollParentView1:SetActive(false) this.ScrollParentView2:SetActive(true) @@ -113,7 +113,7 @@ function this.OnClickTabBtn(_curIndex) this.SingPokemonChipDataShow(go, pokemonChipList[index]) end) this.NoneImage:SetActive(#pokemonChipList <= 0) - this.NoneImageText.text = "未获得名刀碎片" + this.NoneImageText.text = "未获得超级武器碎片" end -- this.ScrollView:ForeachItemGO(function(index, go) -- Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua index e3cfcd561b..ab3243ba89 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua @@ -9,7 +9,7 @@ local upZhenIndex function this:InitComponent(gameObject) this.spLoader = SpriteLoader.New() - Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/name"):GetComponent("Text").text = "选择上阵名刀" + Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/name"):GetComponent("Text").text = "选择上阵超级武器" this.ItemPre = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ItemPre") local v2 = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect @@ -19,7 +19,7 @@ function this:InitComponent(gameObject) this.ScrollView.moveTween.Strength = 1 this.NoneImage = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/NoneImage") this.NoneImageText = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/NoneImage/TextImage/Text"):GetComponent("Text") - this.NoneImageText.text = "无可上阵名刀" + this.NoneImageText.text = "无可上阵超级武器" end function this:BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua index 0a5f82491c..e5f9200505 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua @@ -26,17 +26,17 @@ function GodWeaponMainPanel:InitComponent() this.btnBack = Util.GetGameObject(self.transform, "btnBack") this.btnHelp = Util.GetGameObject(self.transform, "btnhelp") this.btnShop = Util.GetGameObject(self.transform, "btnEndRoot/btnShop/Image") - Util.GetGameObject(self.transform, "btnEndRoot/btnShop/Text"):GetComponent("Text").text="名刀商店" + Util.GetGameObject(self.transform, "btnEndRoot/btnShop/Text"):GetComponent("Text").text="武器商店" Util.GetGameObject(self.transform, "btnEndRoot/btnShop/redPoint"):SetActive(false) this.btnFen = Util.GetGameObject(self.transform, "btnEndRoot/btnFen/Image") - Util.GetGameObject(self.transform, "btnEndRoot/btnFen/Text"):GetComponent("Text").text="名刀分解" + Util.GetGameObject(self.transform, "btnEndRoot/btnFen/Text"):GetComponent("Text").text="武器分解" this.btnFenRed = Util.GetGameObject(self.transform, "btnEndRoot/btnFen/redPoint") this.btnFenRed:SetActive(false) this.btnHand = Util.GetGameObject(self.transform, "btnEndRoot/btnHand/Image") - Util.GetGameObject(self.transform, "btnEndRoot/btnHand/Text"):GetComponent("Text").text="名刀图鉴" + Util.GetGameObject(self.transform, "btnEndRoot/btnHand/Text"):GetComponent("Text").text="武器图鉴" this.btn_hand_red=Util.GetGameObject(self.transform, "btnEndRoot/btnHand/redPoint") this.btn_he = Util.GetGameObject(self.transform, "btnEndRoot/btnHe/Image") - Util.GetGameObject(self.transform, "btnEndRoot/btnHe/Text"):GetComponent("Text").text="名刀合成" + Util.GetGameObject(self.transform, "btnEndRoot/btnHe/Text"):GetComponent("Text").text="武器合成" this.btn_he_red=Util.GetGameObject(self.transform, "btnEndRoot/btnHe/redPoint") this.line = Util.GetGameObject(self.transform,"lineParent/line") this.line:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponSkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponSkillInfoPopup.lua index d602e87e86..478f4ddfbc 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponSkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponSkillInfoPopup.lua @@ -20,7 +20,7 @@ function this:OnOpen(skillName,skillDatas)--data 未获得的时候为灵兽静 LogError("#skillDatas==================="..#skillDatas) for i=1,#skillDatas do local desObj= this.content.transform:GetChild(i).gameObject - Util.GetGameObject(desObj,"star"):GetComponent("Text").text=string.format("名刀%s星激活",skillDatas[i].StarMatch) + Util.GetGameObject(desObj,"star"):GetComponent("Text").text=string.format("超级武器%s星激活",skillDatas[i].StarMatch) Util.GetGameObject(desObj,"infoTxt"):GetComponent("Text").text=skillDatas[i].Desc desObj:SetActive(true) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 3e1ac68746..6372d67980 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -612,7 +612,7 @@ function RewardItemSingleShowPopup:OnShow() this.checkHeroText.text = "查看神龙" elseif rg and rg.ShowItem and itemConfigData.ItemType == ItemType.GodWeaponChip then this.checkHero:SetActive(true) - this.checkHeroText.text = "查看名刀" + this.checkHeroText.text = "查看超级武器" else this.checkHero:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua index c5bdb3f563..78e7d0303c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua @@ -67,7 +67,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11569] this.confirmBtnText.text=Language[11570] else - this.titleText.text="名刀重铸" + this.titleText.text="超级武器重铸" this.confirmBtnText.text="重铸" end this.numImage.sprite = SetIcon(this.spLoader, id) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua index eaece2141e..bc72c693f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua @@ -58,7 +58,7 @@ function this:OnShow(_parent,...) this.getInfoTxt.text=Language[11574] this.resetBtnTxt.text=Language[11575] else - this.infoTxt.text="确认要分解所选的名刀或名刀碎片?" + this.infoTxt.text="确认要分解所选的超级武器或超级武器碎片?" this.titleText.text="确认分解" this.getInfoTxt.text="分解后获得" this.resetBtnTxt.text="分解" diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 87cf93327f..c401658c6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -11,7 +11,7 @@ local _TabData={ -- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "法宝归元" }, [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11603] }, [3] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11735] }, - [4] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = "名刀分解" }, + [4] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = "超级武器分解" }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(255 / 255, 255 / 255, 255 / 255, 1)} @@ -35,7 +35,7 @@ this.prefabs={} local curIndex=0 --Title资源名 local titleImageName={"gongsong_zh","h_xianji_fenjie_zh","lingshou_lingshoufangshengzi_zh","GodWeaponAtlas_fenjie_title_zh"}--,"guiyuan_zh","h_guiyuan_zi_zh" -local titleName={Language[11732],"饰品分解",Language[11735],"名刀分解"} +local titleName={Language[11732],"饰品分解",Language[11735],"超级武器分解"} local titleColor={Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1)} local bgImageName={"LZH417","LZH417","LZH417"}--,"h_huisu_ditu","h_xianji_guiyuanditu" local heroEndBtns = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua index b14d3ecf00..d0fe337faf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua @@ -32,7 +32,7 @@ function this:InitComponent(gameObject) this.scrollbar = Util.GetGameObject(gameObject,"Content/Resolve_GodWeapon/Scrollbar"):GetComponent("Scrollbar") this.Empty = Util.GetGameObject(gameObject,"Content/Resolve_GodWeapon/Empty") local v21 = Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/ItemListRoot"):GetComponent("RectTransform").rect - Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/Empty/Bg/Text"):GetComponent("Text").text="无可分解名刀" + Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/Empty/Bg/Text"):GetComponent("Text").text="无可分解超级武器" this.chipObj=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj") this.btn_remove=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj/btn_remove") this.btn_add=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj/btn_add") @@ -94,11 +94,11 @@ function this:BindEvent() --放生按钮 Util.AddClick(this.confirmBtn,function() if isPokemon and tonumber(LengthOfTable(selectHeroData))==0 then - PopupTipPanel.ShowTip("请选择名刀或名刀碎片") + PopupTipPanel.ShowTip("请选择超级武器或超级武器碎片") return end if not isPokemon and (selectChipId==0 or selectChipNum==0) then - PopupTipPanel.ShowTip("请选择名刀或名刀碎片") + PopupTipPanel.ShowTip("请选择超级武器或超级武器碎片") return end --奖励物品 diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index b20d25997c..034e070c14 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -24,7 +24,7 @@ local tabs = { -- rpType = RedPointType.Equip_Fetter,funcType = FUNCTION_OPEN_TYPE.COMPOUND,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_zhuangbeipian_zi_zh", -- }, [5] = { --神兵 - default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "名刀篇", + default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "超级武器篇", rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "GSX116",zi = "GodWeaponAtlas_handbook_title_zh", }, }