From af7e58f531f3cf406ed5f743f23491f7544202ad Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <3046463818@qq.com> Date: Thu, 15 Jul 2021 21:02:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab | 6 +++--- .../~Lua/Modules/Recruit/RecruitPanelNew.lua | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab index d545f6dad5..7a9024ba08 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab @@ -28,7 +28,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173196095} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalPosition: {x: 0, y: 0, z: 100.00001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6871191882722429008} @@ -36,9 +36,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -89.5, y: -106.4} + m_AnchoredPosition: {x: -85.999695, y: -178.39969} m_SizeDelta: {x: 68, y: 68} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.50000036, y: 0.500001} --- !u!222 &173196099 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index f58f3c534e..d8c4a0508d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -64,8 +64,6 @@ function RecruitPanelNew:InitComponent() self.upHeroPreList[i].pos = Util.GetGameObject(self.upHeroPreList[i].go,"di") self.upHeroPreList[i].itempos = Util.GetGameObject(self.upHeroPreList[i].go,"itempos") self.upHeroPreList[i].item = SubUIManager.Open(SubUIConfig.ItemView,self.upHeroPreList[i].itempos.transform) - self.upHeroPreList[i].item.transform:SetSiblingIndex(1) - self.upHeroPreList[i].item.transform:GetComponent("RectTransform").anchoredPosition = Vector3.New(32,-25.5,0) self.upHeroPreList[i].choosed = Util.GetGameObject(self.upHeroPreList[i].go,"state") end self.btns = {} @@ -203,7 +201,7 @@ function RecruitPanelNew:UpdataWishPanel() local id = data.heroTid if id > 0 then self.upHeroPreList[i].item.gameObject:SetActive(true) - self.upHeroPreList[i].item:OnOpen(false, {id,0}, 0.7, false, false, false, self.sortingOrder) + self.upHeroPreList[i].item:OnOpen(false, {id,0},1, false, false, false, self.sortingOrder) self.upHeroPreList[i].choosed:SetActive(data.status == 1) else self.upHeroPreList[i].item.gameObject:SetActive(false) From 06c8e6f4d869e8b16fe26aeb64986f8c5fcbfd28 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 15 Jul 2021 21:03:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=B8=B8=E5=BF=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version/国内-游心.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version/国内-游心.txt b/Version/国内-游心.txt index 643797378a..604cf44cdb 100644 --- a/Version/国内-游心.txt +++ b/Version/国内-游心.txt @@ -1 +1 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://60.1.1.163:8080/"} \ No newline at end of file +{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://81.71.49.181:8080/"} \ No newline at end of file