From 40b9550c54b369d6c992fe26d1ec4440f0350182 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Fri, 14 Aug 2020 14:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A9=E8=BE=95=E5=89=AF?=
=?UTF-8?q?=E6=9C=AC=E7=AB=8B=E7=BB=98=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Carbon/CarbonTypePanelV2.prefab | 6 +++---
.../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab
index 3f5c5e9ed0..2be4b56f1b 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab
@@ -10194,8 +10194,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: 149, y: 13}
- m_SizeDelta: {x: 1024, y: 1145}
+ m_AnchoredPosition: {x: 149, y: -6.33}
+ m_SizeDelta: {x: 740, y: 393}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320830795291865921
CanvasRenderer:
@@ -10225,7 +10225,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: 27902c70c475c96459f6c00d87a1e441, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4a113cfcb8a88314d9ff385628f91c78, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
index b4fb9ca5b6..bfbe0c037e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
@@ -82,11 +82,11 @@ local type = {
[2] = {
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
bg = "r_Dungeon_rendi_04",
- name = "r_Dungeon_xuanyuanbaojing",
+ name = "r_Dungeon_XuanYuan_huli",
live = "m_chsm_0035_png",
livePos = Vector2(274.5, -408.1),
liveSize = Vector2(1612, 1802),
- tipBg = "r_Dungeon_juqingdian",
+ tipBg = "r_Dungeon_wujingdian",
resetTime = string.format("%s",specialConfig[75].Value),
tip = string.format("%s",specialConfig[76].Value),
redPointType = RedPointType.People_Mirror