From 76105dd37cbdfc0f48f7be5bb71d7d484ad31eb7 Mon Sep 17 00:00:00 2001
From: wangzhenxing <1545929779@qq.com>
Date: Wed, 24 Jan 2024 16:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A3=E5=99=A8=E4=BF=A1=E6=81=AF=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Pokemon/PokemonInfoPanel.prefab | 6 +++---
.../Prefabs/UI/Resolve/ResolvePanel.prefab | 16 ++++++++--------
Assets/ManagedResources/~Lua/Common/Language.lua | 8 ++++----
.../Pokemon/view/PokemonInfoPanel_UpStar.lua | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
index 6d27cadf59..9d114186cd 100644
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
@@ -3287,7 +3287,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &4316996340489144221
RectTransform:
m_ObjectHideFlags: 0
@@ -3304,7 +3304,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: 62.5, y: 51.7}
+ m_AnchoredPosition: {x: 83, y: 39}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2573756644717642345
@@ -9933,7 +9933,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8326139279270606670
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
index 5e7134aacc..606360887e 100644
--- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
@@ -333,7 +333,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &982844875
RectTransform:
m_ObjectHideFlags: 0
@@ -354,7 +354,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: 299, y: 467.98}
+ m_AnchoredPosition: {x: 312.99997, y: 365}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.50000006, y: 0.5}
--- !u!1 &1535342848
@@ -5920,7 +5920,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &6630273786794472594
RectTransform:
m_ObjectHideFlags: 0
@@ -79797,7 +79797,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -93022,7 +93022,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: 346, y: 382}
+ m_AnchoredPosition: {x: 288, y: 359}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &69413885737802980
@@ -105114,7 +105114,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {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}
@@ -185665,7 +185665,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: 218.4, y: 382}
+ m_AnchoredPosition: {x: 160.39996, y: 359}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5119530763972907221
@@ -195110,7 +195110,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4456537145914281463
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index 83d042b28a..e683aea3bb 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -1571,10 +1571,10 @@ Language = {
[11570] = GetLanguageStrById("重塑"),
[11571] = GetLanguageStrById("确认花费 %s将%s重塑为初始状态,并100%s返还养成消耗"),
[11572] = GetLanguageStrById("确认花费 %s将%s重塑为初始状态,并100%s返还养成消耗"),
- [11573] = GetLanguageStrById("确认放生"),
- [11574] = GetLanguageStrById("放生后获得"),
- [11575] = GetLanguageStrById("放生"),
- [11576] = GetLanguageStrById("确认要放生所选的圣器或圣器碎片?"),
+ [11573] = GetLanguageStrById("确认分解"),
+ [11574] = GetLanguageStrById("分解后获得"),
+ [11575] = GetLanguageStrById("分解"),
+ [11576] = GetLanguageStrById("确认要分解所选的圣器或圣器碎片?"),
[11577] = GetLanguageStrById("出战加成"),
[11578] = GetLanguageStrById("出战圣器对英雄加成"),
[11579] = GetLanguageStrById("购买等级不能为0!"),
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
index c6d78661b3..283597d513 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua
@@ -103,7 +103,7 @@ function this.OnShowData()
local starSize2=Vector2(50,50)
local type2=1
if star2>5 then
- star2=star2+6
+ star2=star2+5
starSize2 = Vector2.New(1,-13)
type2=3
end