From ab7d04549597629dc94ce39e98ba3412b71be267 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 17:29:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= =?UTF-8?q?=E6=B3=95=E5=AE=9D=20=E7=AB=9E=E6=8A=80=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaTypePanel.prefab | 8 ++-- .../UI/RoleInfo/RoleTalismanPanelV2.prefab | 42 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab index de4e8066df..0eef7e56b1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab @@ -429,8 +429,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: 285, y: -132} - m_SizeDelta: {x: 550, y: 50} + m_AnchoredPosition: {x: 254, y: -132} + m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1216242209 CanvasRenderer: @@ -2229,7 +2229,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5386\u53F2\u6700\u9AD8\u6392\u540D\uFF1A" + m_Text: "\u5386\u53F2\u6700\u9AD8\uFF1A" LanguageIndex: 0 --- !u!1 &2979872552327346480 GameObject: @@ -2569,7 +2569,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -189.88, y: -174.8} - m_SizeDelta: {x: 586.35, y: 50} + m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1272429540278668392 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab index d38afeff5d..6b4f8aec07 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab @@ -4849,7 +4849,7 @@ ParticleSystem: --- !u!199 &5475183851846367264 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10058,7 +10058,7 @@ ParticleSystem: --- !u!199 &7175515632173838630 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14819,7 +14819,7 @@ ParticleSystem: --- !u!199 &2424411900952576964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19575,7 +19575,7 @@ ParticleSystem: --- !u!199 &7003235447524177872 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24689,7 +24689,7 @@ ParticleSystem: --- !u!199 &6775624527687177699 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29434,7 +29434,7 @@ ParticleSystem: --- !u!199 &876445508905491866 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34079,7 +34079,7 @@ ParticleSystem: --- !u!199 &4107366793135521658 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39171,7 +39171,7 @@ ParticleSystem: --- !u!199 &8761706858282258751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44003,7 +44003,7 @@ ParticleSystem: --- !u!199 &4396747555986394406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48844,7 +48844,7 @@ ParticleSystem: --- !u!199 &4152745225773462240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54304,7 +54304,7 @@ ParticleSystem: --- !u!199 &635127155071403073 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59468,7 +59468,7 @@ ParticleSystem: --- !u!199 &8461887328555741404 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64303,7 +64303,7 @@ ParticleSystem: --- !u!199 &4035478127761353795 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64432,10 +64432,10 @@ RectTransform: m_Father: {fileID: 7371073405952275444} m_RootOrder: 10 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: 438, y: 112} - m_SizeDelta: {x: 198.7, y: 183.8} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -99.350006, y: 0} + m_SizeDelta: {x: 198.70001, y: 183.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6386614878208396629 CanvasRenderer: @@ -69272,7 +69272,7 @@ ParticleSystem: --- !u!199 &3287078869885518980 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69555,7 +69555,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: 0, y: -103} + m_AnchoredPosition: {x: 0, y: -371} m_SizeDelta: {x: 1080, y: 973} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7368342118760807934 @@ -74513,7 +74513,7 @@ ParticleSystem: --- !u!199 &5949988206710758398 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74609,7 +74609,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000030517578} + m_AnchoredPosition: {x: 0, y: 0.000093975716} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8134860863072840228 From c6425d9fe9d17ea82a8d98f923646b8191e8f425 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 31 Mar 2021 17:30:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E5=9D=90?= =?UTF-8?q?=E9=AA=91=E6=97=B6=E8=A3=85=E3=80=91=E4=B8=89=E7=95=8C=E9=99=8D?= =?UTF-8?q?=E9=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab | 12 ++++++------ .../~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab index 46ef7c50c4..043384dc14 100644 --- a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab @@ -479,8 +479,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: 4, y: 160} - m_SizeDelta: {x: 234, y: 384} + m_AnchoredPosition: {x: 4, y: 121.3} + m_SizeDelta: {x: 186.9, y: 306.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3673423893004458656 CanvasRenderer: @@ -825,8 +825,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: 4, y: 160} - m_SizeDelta: {x: 234, y: 384} + m_AnchoredPosition: {x: 4, y: 120} + m_SizeDelta: {x: 185.2, y: 304} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &731834619246549618 CanvasRenderer: @@ -1240,8 +1240,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: 3, y: 162} - m_SizeDelta: {x: 234, y: 384} + m_AnchoredPosition: {x: 3, y: 122} + m_SizeDelta: {x: 185.2, y: 304} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1863043904829440535 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index e01d8e467b..6463ff54a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -151,7 +151,7 @@ function DemonSlayerPanel:SetRank(ActInfo) designation = allRankData[i].userTitle } npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData) - npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,nil,WALK_DIR.IDLE_LEFT) + npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-132.73,0),WALK_DIR.IDLE_LEFT) else image.enabled = true item.text = Language[10423] From 60353d6dbd883d55ba31cb2fb92105614602aa19 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 31 Mar 2021 17:40:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=BD=92=E5=85=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 50 +++++++++---------- .../~Lua/Modules/Pokemon/PokemonMainPanel.lua | 2 +- .../~Lua/Modules/Resolve/ResolvePanel.lua | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index f97ffbed62..800280fc46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -1758,8 +1758,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -540, y: 50} - m_SizeDelta: {x: 1080, y: 100} + m_AnchoredPosition: {x: -540, y: 52.700195} + m_SizeDelta: {x: 1080, y: 105.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &894267777490811510 GameObject: @@ -11130,15 +11130,15 @@ RectTransform: m_GameObject: {fileID: 6698392907551047934} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6859356168919729670} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 76, y: 50} - m_SizeDelta: {x: 1031.1, y: 100} + m_AnchoredPosition: {x: -0.0024872, y: 50.4} + m_SizeDelta: {x: 1200, y: 105.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3622489286463543318 MonoBehaviour: @@ -11950,10 +11950,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 608, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553425786306 CanvasRenderer: @@ -12205,10 +12205,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553461871492 CanvasRenderer: @@ -12952,10 +12952,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555069003081 CanvasRenderer: @@ -13108,10 +13108,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 4 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 776, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555296664243 CanvasRenderer: @@ -13226,10 +13226,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 272, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555409597101 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 29b2abdd05..5204139f4e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -85,7 +85,7 @@ function PokemonMainPanel:BindEvent() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonUpZhenAddPro,{}) end) Util.AddClick(this.btnOut, function() - UIManager.OpenPanel(UIName.ResolvePanel,5) + UIManager.OpenPanel(UIName.ResolvePanel,3) end) Util.AddClick(this.btnFetter, function() UIManager.OpenPanel(UIName.TianShuMiJuan,3) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index cc3fbddad7..55e98269c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -56,7 +56,7 @@ function ResolvePanel:InitComponent() this.selectHeroBtn = Util.GetGameObject(this.panel, "endTabs/selectBtn") - for i = 1, 3 do + for i = 1, 5 do heroEndBtns[i]=Util.GetGameObject(this.panel, "endTabs/btnHeroGrid/btnHeroGrid/Btn"..i-1) Util.GetGameObject(heroEndBtns[i],"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyIcon[i-1]) end From c280b8542671ab595255b354fb6341cd84bcd7d2 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 17:49:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Expert/ExpertPanel.prefab | 106 +++++++++--------- .../Prefabs/UI/NewActivity/GiftPre.prefab | 12 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index ca439fa532..2c4719a18f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -5011,7 +5011,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11388,7 +11388,7 @@ ParticleSystem: --- !u!199 &85288511972748413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16131,7 +16131,7 @@ ParticleSystem: --- !u!199 &85288512077974317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20829,7 +20829,7 @@ ParticleSystem: --- !u!199 &85288512168349841 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25527,7 +25527,7 @@ ParticleSystem: --- !u!199 &85288512214742610 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30390,7 +30390,7 @@ ParticleSystem: --- !u!199 &85288513168343927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35088,7 +35088,7 @@ ParticleSystem: --- !u!199 &85288513351305705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40948,7 +40948,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45646,7 +45646,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50344,7 +50344,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55087,7 +55087,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59785,7 +59785,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64483,7 +64483,7 @@ ParticleSystem: --- !u!199 &5899601245091579705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69921,7 +69921,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74846,7 +74846,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -81302,7 +81302,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87715,7 +87715,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94257,7 +94257,7 @@ ParticleSystem: --- !u!199 &7275324880265961258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100145,7 +100145,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105477,7 +105477,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110303,7 +110303,7 @@ ParticleSystem: --- !u!199 &7446892149717719861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -117305,7 +117305,7 @@ ParticleSystem: --- !u!199 &7994448136678369462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -122983,7 +122983,7 @@ ParticleSystem: --- !u!199 &6366831406703767530 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127937,7 +127937,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -133735,7 +133735,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -138482,7 +138482,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -145059,7 +145059,7 @@ ParticleSystem: --- !u!199 &3736263280892008042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -149831,7 +149831,7 @@ ParticleSystem: --- !u!199 &3736263281027369366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -154749,7 +154749,7 @@ ParticleSystem: --- !u!199 &3736263281144678159 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -159447,7 +159447,7 @@ ParticleSystem: --- !u!199 &3736263281160650038 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -164150,7 +164150,7 @@ ParticleSystem: --- !u!199 &3736263281325203082 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -169192,7 +169192,7 @@ ParticleSystem: --- !u!199 &3736263282101879313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -173890,7 +173890,7 @@ ParticleSystem: --- !u!199 &3736263282140865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178663,7 +178663,7 @@ ParticleSystem: --- !u!199 &3736263282223057855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183406,7 +183406,7 @@ ParticleSystem: --- !u!199 &3736263282260434226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188862,7 +188862,7 @@ ParticleSystem: --- !u!199 &8736007889913585379 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -193863,7 +193863,7 @@ ParticleSystem: --- !u!199 &6218818886541518366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200326,7 +200326,7 @@ ParticleSystem: --- !u!199 &3061375693970565652 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -205886,7 +205886,7 @@ ParticleSystem: --- !u!199 &6371239923318808130 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -214229,7 +214229,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -219108,7 +219108,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225714,7 +225714,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -231034,7 +231034,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -235732,7 +235732,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -246866,7 +246866,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253210,7 +253210,7 @@ ParticleSystem: --- !u!199 &3952339559707849751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253383,7 +253383,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: 0, y: 0} + m_AnchoredPosition: {x: 62, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6632034429970747655 @@ -260006,7 +260006,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -267204,7 +267204,7 @@ ParticleSystem: --- !u!199 &4947693289891535506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -276623,7 +276623,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -282025,7 +282025,7 @@ ParticleSystem: --- !u!199 &2442695948598551547 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -289698,7 +289698,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -294396,7 +294396,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab index 8a22781e99..9893c6890c 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab @@ -364,7 +364,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -33} + m_AnchoredPosition: {x: 83, y: -33} m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2174684552807220235 @@ -459,7 +459,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 57, y: -33} + m_AnchoredPosition: {x: 60, y: -33} m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7607199292195836623 @@ -804,7 +804,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380, y: -36} + m_AnchoredPosition: {x: 700, y: -36} m_SizeDelta: {x: 760, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &506710367147554545 @@ -820,7 +820,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 57 + m_Left: 80 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -1973,7 +1973,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 57, y: -33} + m_AnchoredPosition: {x: 60, y: -33} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &3873702267220975721 @@ -2496,7 +2496,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103, y: -33} + m_AnchoredPosition: {x: 106, y: -33} m_SizeDelta: {x: 12, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8379782961658539162