From cc0e0c20cbea53853ec4ff2122cdd4e12a0097cd Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 16:19:36 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E3=80=90ID1017607=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BB=99=E7=BC=98=E6=B1=87=E8=81=9A=E7=AE=B1=E3=80=91=E7=AE=B1?= =?UTF-8?q?=E5=AD=90=E5=8F=AF=E9=A2=86=E5=8F=96=E7=82=B9=E5=87=BB=E5=90=8E?= =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=8C=E5=8A=A8=E6=95=88=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=EF=BC=8C=E5=88=87=E6=8D=A2=E7=95=8C=E9=9D=A2=E7=AE=B1=E5=AD=90?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B7=B3=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index c3c9aa6759..b5cb96ff3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -88,7 +88,6 @@ function RecruitPanelNew:BindEvent() --宝箱按钮 Util.AddClick(self.boxBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox) - self.boxIcon:GetComponent("Animator").enabled = false --self.UI_effect_RecruitPanel_box_normal:SetActive(true) end) --奖池预览按钮 From 4442b9c38b824303a41829e3314330680d8c524e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 16:54:38 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E3=80=90ID1017598=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E7=99=BD=E6=B3=BD=E6=B4=BB=E5=8A=A8=E3=80=91?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=BA=A2=E8=89=B2=E8=A3=85?= =?UTF-8?q?=E5=A4=87TIPS=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2=E8=87=B3?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E7=99=BD=E6=B3=BD=E4=BA=92=E5=8A=A8=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=87=91=E8=89=B2=E8=A3=85=E5=A4=87=EF=BC=8C=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E8=A3=85=E5=A4=87TIPS=E4=B8=AD=E4=BC=9A?= =?UTF-8?q?=E5=A4=9A=E5=87=BA=E5=A5=97=E8=A3=85=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 51af6d45c2..2a7ca0f285 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -133,11 +133,15 @@ function RoleEquipChangePopup:OnOpen(...) nextEquipData=data[5] position=data[6] elseif type==4 then + curHeroData=data[3] curEquipData=data[4] + nextEquipData=data[5] + position=data[6] end end function RoleEquipChangePopup:OnShow() + equipSuit = {} if curHeroData then equipSuit = HeroManager.GetCurHeroEquipSuitPros(curHeroData.equipIdList) end From d1abaf403c273d0b00d906962ffffba27168a051 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 17:23:14 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8B=E6=96=B9=E8=8E=B7=E5=8F=96=E9=80=94?= =?UTF-8?q?=E5=BE=84=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RewardTalismanSingleShowPopup.prefab | 2075 ++++++++--------- 1 file changed, 1037 insertions(+), 1038 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index c9051570a4..b6723a0644 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -363,8 +363,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 198231294764616417} - - component: {fileID: 19489793234866415} - component: {fileID: 349189508491785637} + - component: {fileID: 7871582414776459346} m_Layer: 5 m_Name: grid m_TagString: Untagged @@ -384,41 +384,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2300787479037304609} - - {fileID: 1855145292775813178} - - {fileID: 6786997467628515254} - - {fileID: 6712737950430235333} + - {fileID: 9130519543248720746} + - {fileID: 812743166936767369} + - {fileID: 5565850619807346734} m_Father: {fileID: 199185578126405607} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000004381774, y: 0.000003793724} - m_SizeDelta: {x: 807.66, y: 0} + m_AnchoredPosition: {x: 36.81, y: 0.000012449178} + m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &19489793234866415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133032757010905065} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: -54 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 912.8, y: 134.2} - m_Spacing: {x: 0, y: 1.22} - m_Constraint: 0 - m_ConstraintCount: 2 --- !u!114 &349189508491785637 MonoBehaviour: m_ObjectHideFlags: 0 @@ -433,6 +409,29 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &7871582414776459346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133032757010905065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: -45 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 160 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &133047354883971467 GameObject: m_ObjectHideFlags: 0 @@ -1044,9 +1043,9 @@ RectTransform: m_Father: {fileID: 198690712392213173} m_RootOrder: 8 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: -1.8010254, y: 374} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 463.10007, y: -481.31995} m_SizeDelta: {x: 912.8, y: 224.5} m_Pivot: {x: 0.5, y: 1} --- !u!222 &201531387265230511 @@ -2414,6 +2413,166 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +88 +--- !u!1 &169937810737352066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4151378523381500745} + - component: {fileID: 8772833950577171223} + - component: {fileID: 4406153649013032136} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4151378523381500745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169937810737352066} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5565850619807346734} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8772833950577171223 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169937810737352066} + m_CullTransparentMesh: 0 +--- !u!114 &4406153649013032136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169937810737352066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 +--- !u!1 &216639974895431481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5390466600495588233} + - component: {fileID: 4498264305719891998} + - component: {fileID: 2086306333582216562} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5390466600495588233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216639974895431481} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1045459235679090009} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4498264305719891998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216639974895431481} + m_CullTransparentMesh: 0 +--- !u!114 &2086306333582216562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216639974895431481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 --- !u!1 &420828274642148718 GameObject: m_ObjectHideFlags: 0 @@ -2525,6 +2684,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &759728753419975957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1856611184421124779} + - component: {fileID: 5144043615951411782} + - component: {fileID: 3209877658254578913} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1856611184421124779 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759728753419975957} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 812743166936767369} + m_RootOrder: 0 + 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: 465, y: -67.1} + m_SizeDelta: {x: 912.8, y: 134.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5144043615951411782 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759728753419975957} + m_CullTransparentMesh: 0 +--- !u!114 &3209877658254578913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759728753419975957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &924357236229822250 GameObject: m_ObjectHideFlags: 0 @@ -2744,6 +2977,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1154001541435824933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5547999421857208631} + - component: {fileID: 8061508045472220209} + - component: {fileID: 3725267969685417627} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5547999421857208631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154001541435824933} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5638104294390058032} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8061508045472220209 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154001541435824933} + m_CullTransparentMesh: 0 +--- !u!114 &3725267969685417627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154001541435824933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 --- !u!1 &1276499505387091523 GameObject: m_ObjectHideFlags: 0 @@ -2818,145 +3131,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1307542021291275939 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5644997932984477076} - - component: {fileID: 1248362649893743824} - - component: {fileID: 4545452401177318547} - - component: {fileID: 5358647473038145099} - - component: {fileID: 6373329342058848405} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5644997932984477076 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307542021291275939} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1832551275948225885} - m_Father: {fileID: 1855145292775813178} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1248362649893743824 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307542021291275939} - m_CullTransparentMesh: 0 ---- !u!114 &4545452401177318547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307542021291275939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &5358647473038145099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307542021291275939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4545452401177318547} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &6373329342058848405 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307542021291275939} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1505369200094870839 GameObject: m_ObjectHideFlags: 0 @@ -3325,86 +3499,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &1924697710590543320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6398183781058931077} - - component: {fileID: 4619679983444858022} - - component: {fileID: 730178168836730669} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6398183781058931077 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924697710590543320} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6712737950430235333} - m_RootOrder: 1 - 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: -121.8, y: 0.14004} - m_SizeDelta: {x: 562.6, y: 96.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4619679983444858022 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924697710590543320} - m_CullTransparentMesh: 0 ---- !u!114 &730178168836730669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1924697710590543320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 38 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 --- !u!1 &2086149569808568391 GameObject: m_ObjectHideFlags: 0 @@ -3519,7 +3613,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.000030518, y: -0.0000038147} + m_AnchoredPosition: {x: 465, y: -67.1} m_SizeDelta: {x: 912.8, y: 134.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2298426549005872121 @@ -3593,7 +3687,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: -121.8, y: 0.14004} + m_AnchoredPosition: {x: 309, y: -67.1} m_SizeDelta: {x: 562.6, y: 96.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2299082154062377725 @@ -3902,9 +3996,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 402.4, y: -67.1} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -45, y: -0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!1 &2087303444814132181 GameObject: m_ObjectHideFlags: 0 @@ -3942,7 +4036,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: 280, y: 0.13999999} + m_AnchoredPosition: {x: 757, y: -67.11} m_SizeDelta: {x: 241.06, y: 96.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2298931393330331001 @@ -4044,7 +4138,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &2268941580237270688 +--- !u!1 &2334401674260720076 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4052,251 +4146,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8750779867433621761} - - component: {fileID: 8841464641442058791} - - component: {fileID: 4488855498945070546} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8750779867433621761 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268941580237270688} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6786997467628515254} - m_RootOrder: 1 - 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: -121.8, y: 0.14004} - m_SizeDelta: {x: 562.6, y: 96.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8841464641442058791 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268941580237270688} - m_CullTransparentMesh: 0 ---- !u!114 &4488855498945070546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268941580237270688} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 38 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 ---- !u!1 &2853464032665096602 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5415201957261302033} - - component: {fileID: 5957776981461109463} - - component: {fileID: 2913314614754848761} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5415201957261302033 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2853464032665096602} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 17232117882635496} - m_RootOrder: 0 - 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: 2.9, y: -3.5} - m_SizeDelta: {x: 183.5, y: 65.1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5957776981461109463 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2853464032665096602} - m_CullTransparentMesh: 0 ---- !u!114 &2913314614754848761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2853464032665096602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &3023322433121237832 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6343665499526110001} - - component: {fileID: 8043571556213429361} - - component: {fileID: 2648161229115474209} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6343665499526110001 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3023322433121237832} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1855145292775813178} - m_RootOrder: 1 - 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: -121.8, y: 0.14004} - m_SizeDelta: {x: 562.6, y: 96.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8043571556213429361 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3023322433121237832} - m_CullTransparentMesh: 0 ---- !u!114 &2648161229115474209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3023322433121237832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 38 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 ---- !u!1 &3120616290883769744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 17232117882635496} - - component: {fileID: 5129680582330979372} - - component: {fileID: 5773168976419183735} - - component: {fileID: 8537137631616062566} - - component: {fileID: 1797397185085465274} + - component: {fileID: 5638104294390058032} + - component: {fileID: 5942579038879037164} + - component: {fileID: 3178095050707029475} + - component: {fileID: 3456665851875393026} + - component: {fileID: 5351888973575407828} m_Layer: 5 m_Name: btnSure m_TagString: Untagged @@ -4304,41 +4158,41 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &17232117882635496 +--- !u!224 &5638104294390058032 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3120616290883769744} + m_GameObject: {fileID: 2334401674260720076} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5415201957261302033} - m_Father: {fileID: 6712737950430235333} + - {fileID: 5547999421857208631} + m_Father: {fileID: 5565850619807346734} m_RootOrder: 2 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: 280, y: 0.13999999} + m_AnchoredPosition: {x: 757, y: -67.11} m_SizeDelta: {x: 241.06, y: 96.18} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5129680582330979372 +--- !u!222 &5942579038879037164 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3120616290883769744} + m_GameObject: {fileID: 2334401674260720076} m_CullTransparentMesh: 0 ---- !u!114 &5773168976419183735 +--- !u!114 &3178095050707029475 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3120616290883769744} + m_GameObject: {fileID: 2334401674260720076} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -4361,13 +4215,13 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &8537137631616062566 +--- !u!114 &3456665851875393026 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3120616290883769744} + m_GameObject: {fileID: 2334401674260720076} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -4398,20 +4252,20 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 5773168976419183735} + m_TargetGraphic: {fileID: 3178095050707029475} m_OnClick: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!95 &1797397185085465274 +--- !u!95 &5351888973575407828 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3120616290883769744} + m_GameObject: {fileID: 2334401674260720076} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} @@ -4423,7 +4277,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &3217993250958125810 +--- !u!1 &2386991811422994216 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4431,36 +4285,152 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1855145292775813178} + - component: {fileID: 8845363603797328995} + - component: {fileID: 1937238611480105803} + - component: {fileID: 2348752496497957087} m_Layer: 5 - m_Name: getTuPre (1) + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1855145292775813178 + m_IsActive: 1 +--- !u!224 &8845363603797328995 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3217993250958125810} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 2386991811422994216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4682180829715196077} - - {fileID: 6343665499526110001} - - {fileID: 5644997932984477076} - m_Father: {fileID: 198231294764616417} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 5565850619807346734} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 402.4, y: -202.51999} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 465, y: -67.1} m_SizeDelta: {x: 912.8, y: 134.2} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1937238611480105803 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2386991811422994216} + m_CullTransparentMesh: 0 +--- !u!114 &2348752496497957087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2386991811422994216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &3156459586612505881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4898355387418177115} + - component: {fileID: 8565169864530583995} + - component: {fileID: 68107760682442070} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4898355387418177115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3156459586612505881} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4395058404302649163} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8565169864530583995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3156459586612505881} + m_CullTransparentMesh: 0 +--- !u!114 &68107760682442070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3156459586612505881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 --- !u!1 &3244815433901757432 GameObject: m_ObjectHideFlags: 0 @@ -4535,7 +4505,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3745593490375345921 +--- !u!1 &3298882304091492323 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4543,72 +4513,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7361982164574635049} - - component: {fileID: 1801500859203343826} - - component: {fileID: 3020606725102209544} + - component: {fileID: 8505229305728596277} + - component: {fileID: 4592509722218037825} + - component: {fileID: 3443549996120760039} m_Layer: 5 - m_Name: Image + m_Name: info m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7361982164574635049 +--- !u!224 &8505229305728596277 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3745593490375345921} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3298882304091492323} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6786997467628515254} - m_RootOrder: 0 + m_Father: {fileID: 9130519543248720746} + m_RootOrder: 1 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} + m_AnchoredPosition: {x: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1801500859203343826 +--- !u!222 &4592509722218037825 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3745593490375345921} + m_GameObject: {fileID: 3298882304091492323} m_CullTransparentMesh: 0 ---- !u!114 &3020606725102209544 +--- !u!114 &3443549996120760039 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3745593490375345921} + m_GameObject: {fileID: 3298882304091492323} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 --- !u!1 &4383397681474610825 GameObject: m_ObjectHideFlags: 0 @@ -4764,7 +4740,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5063459038296090801 +--- !u!1 &4898652263762072277 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4772,116 +4748,137 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6786997467628515254} + - component: {fileID: 1045459235679090009} + - component: {fileID: 6790300817096833717} + - component: {fileID: 5096378317279521760} + - component: {fileID: 7763131697891552437} + - component: {fileID: 8403333634841275379} m_Layer: 5 - m_Name: getTuPre (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6786997467628515254 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5063459038296090801} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7361982164574635049} - - {fileID: 8750779867433621761} - - {fileID: 8935979027305657171} - m_Father: {fileID: 198231294764616417} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 402.4, y: -337.94} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5398714293388228851 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1832551275948225885} - - component: {fileID: 3594756966081036165} - - component: {fileID: 6638382700303330528} - m_Layer: 5 - m_Name: Text + m_Name: btnSure m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1832551275948225885 +--- !u!224 &1045459235679090009 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5398714293388228851} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4898652263762072277} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5644997932984477076} - m_RootOrder: 0 + m_Children: + - {fileID: 5390466600495588233} + m_Father: {fileID: 812743166936767369} + m_RootOrder: 2 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: 2.9, y: -3.5} - m_SizeDelta: {x: 183.5, y: 65.1} + m_AnchoredPosition: {x: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3594756966081036165 +--- !u!222 &6790300817096833717 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5398714293388228851} + m_GameObject: {fileID: 4898652263762072277} m_CullTransparentMesh: 0 ---- !u!114 &6638382700303330528 +--- !u!114 &5096378317279521760 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5398714293388228851} + m_GameObject: {fileID: 4898652263762072277} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7763131697891552437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4898652263762072277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5096378317279521760} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8403333634841275379 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4898652263762072277} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5432164890005914631 GameObject: m_ObjectHideFlags: 0 @@ -5303,6 +5300,44 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6320678547070467430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5565850619807346734} + m_Layer: 5 + m_Name: getTuPre (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5565850619807346734 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6320678547070467430} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8845363603797328995} + - {fileID: 4151378523381500745} + - {fileID: 5638104294390058032} + m_Father: {fileID: 198231294764616417} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -480} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!1 &6451064774220345419 GameObject: m_ObjectHideFlags: 0 @@ -5377,6 +5412,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6624764881940050544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 812743166936767369} + m_Layer: 5 + m_Name: getTuPre (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &812743166936767369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6624764881940050544} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1856611184421124779} + - {fileID: 3483562784597020179} + - {fileID: 1045459235679090009} + m_Father: {fileID: 198231294764616417} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -320} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &6959210116662689221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9130519543248720746} + m_Layer: 5 + m_Name: getTuPre (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9130519543248720746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6959210116662689221} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4605001186534200826} + - {fileID: 8505229305728596277} + - {fileID: 4395058404302649163} + m_Father: {fileID: 198231294764616417} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -160} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!1 &7215787093242135902 GameObject: m_ObjectHideFlags: 0 @@ -5451,6 +5562,160 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7280055175116792080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3483562784597020179} + - component: {fileID: 174670108962566389} + - component: {fileID: 1544746301443101624} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3483562784597020179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280055175116792080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 812743166936767369} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &174670108962566389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280055175116792080} + m_CullTransparentMesh: 0 +--- !u!114 &1544746301443101624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280055175116792080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 +--- !u!1 &7380241829325254154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4605001186534200826} + - component: {fileID: 8132299454104130091} + - component: {fileID: 3886045907886235944} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4605001186534200826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380241829325254154} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9130519543248720746} + m_RootOrder: 0 + 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: 465, y: -67.1} + m_SizeDelta: {x: 912.8, y: 134.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8132299454104130091 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380241829325254154} + m_CullTransparentMesh: 0 +--- !u!114 &3886045907886235944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380241829325254154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7664119057132524748 GameObject: m_ObjectHideFlags: 0 @@ -5574,6 +5839,145 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &7832834837554921877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4395058404302649163} + - component: {fileID: 6467835796936602727} + - component: {fileID: 7662037241680004072} + - component: {fileID: 7303960128504308937} + - component: {fileID: 3690958941985638358} + m_Layer: 5 + m_Name: btnSure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4395058404302649163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832834837554921877} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4898355387418177115} + m_Father: {fileID: 9130519543248720746} + m_RootOrder: 2 + 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: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6467835796936602727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832834837554921877} + m_CullTransparentMesh: 0 +--- !u!114 &7662037241680004072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832834837554921877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7303960128504308937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832834837554921877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7662037241680004072} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &3690958941985638358 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7832834837554921877} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7960332953171444509 GameObject: m_ObjectHideFlags: 0 @@ -5716,408 +6120,3 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5F3A\u5316\u5C5E\u6027\uFF1A" LanguageIndex: 0 ---- !u!1 &8486201929363825013 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3202514696862201996} - - component: {fileID: 8337682919213702650} - - component: {fileID: 662915627080129522} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3202514696862201996 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8486201929363825013} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8935979027305657171} - m_RootOrder: 0 - 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: 2.9, y: -3.5} - m_SizeDelta: {x: 183.5, y: 65.1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8337682919213702650 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8486201929363825013} - m_CullTransparentMesh: 0 ---- !u!114 &662915627080129522 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8486201929363825013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &8500532140274456002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8935979027305657171} - - component: {fileID: 5800298228857124042} - - component: {fileID: 7601692769282534235} - - component: {fileID: 8214961072753860732} - - component: {fileID: 3845866100332023892} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8935979027305657171 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8500532140274456002} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3202514696862201996} - m_Father: {fileID: 6786997467628515254} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5800298228857124042 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8500532140274456002} - m_CullTransparentMesh: 0 ---- !u!114 &7601692769282534235 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8500532140274456002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &8214961072753860732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8500532140274456002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7601692769282534235} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &3845866100332023892 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8500532140274456002} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8538230499847036768 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7999292784026150624} - - component: {fileID: 3983089250970844613} - - component: {fileID: 9092106502327943666} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7999292784026150624 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8538230499847036768} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6712737950430235333} - m_RootOrder: 0 - 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3983089250970844613 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8538230499847036768} - m_CullTransparentMesh: 0 ---- !u!114 &9092106502327943666 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8538230499847036768} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!1 &8968074103277310296 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6712737950430235333} - m_Layer: 5 - m_Name: getTuPre (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6712737950430235333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8968074103277310296} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7999292784026150624} - - {fileID: 6398183781058931077} - - {fileID: 17232117882635496} - m_Father: {fileID: 198231294764616417} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 402.4, y: -473.36} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &9132587297425716189 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4682180829715196077} - - component: {fileID: 6649289021045655148} - - component: {fileID: 1092272977103195444} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4682180829715196077 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9132587297425716189} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1855145292775813178} - m_RootOrder: 0 - 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6649289021045655148 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9132587297425716189} - m_CullTransparentMesh: 0 ---- !u!114 &1092272977103195444 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9132587297425716189} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 From 399d90809d2341e1358c50f682e1f36c91edecd2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 17:32:07 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8B=E6=96=B9=E8=8E=B7=E5=8F=96=E9=80=94?= =?UTF-8?q?=E5=BE=84=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RewardTalismanSingleShowPopup.prefab | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index b6723a0644..98f3dda37e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -198,10 +198,10 @@ RectTransform: m_Father: {fileID: 8737735201863086632} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 396.415, y: -53.6} - m_SizeDelta: {x: 792.83, y: 6.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 396.415, y: 0} + m_SizeDelta: {x: 792.83, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &20288529025851301 MonoBehaviour: @@ -392,7 +392,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 36.81, y: 0.000012449178} + m_AnchoredPosition: {x: 36.81, y: -0.00004825481} m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &349189508491785637 @@ -1043,9 +1043,9 @@ RectTransform: m_Father: {fileID: 198690712392213173} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 463.10007, y: -481.31995} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 463.10007, y: 377.71997} m_SizeDelta: {x: 912.8, y: 224.5} m_Pivot: {x: 0.5, y: 1} --- !u!222 &201531387265230511 @@ -2790,9 +2790,9 @@ RectTransform: m_Father: {fileID: 4273494743000231776} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 86.05, y: -26.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 172.1, y: 53.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2866437770918826274 @@ -3163,9 +3163,9 @@ RectTransform: m_Father: {fileID: 8737735201863086632} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 449.46, y: -62.12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 898.92, y: 4.4400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5216651350474714386 @@ -3456,10 +3456,10 @@ RectTransform: m_Father: {fileID: 4273494743000231776} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 396.415, y: -53.6} - m_SizeDelta: {x: 792.83, y: 6.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 396.415, y: 0} + m_SizeDelta: {x: 792.83, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6476048963093022719 MonoBehaviour: @@ -5057,7 +5057,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4273494743000231776 RectTransform: m_ObjectHideFlags: 0 @@ -5075,10 +5075,10 @@ RectTransform: m_Father: {fileID: 199198497822447983} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 412.90002, y: -64.34} - m_SizeDelta: {x: 825.8, y: 64.34} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 412.90002, y: 0} + m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &838287439496209292 MonoBehaviour: @@ -5370,9 +5370,9 @@ RectTransform: m_Father: {fileID: 4273494743000231776} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 449.46, y: -62.12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 898.92, y: 4.4400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8117713543445626114 @@ -5735,7 +5735,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8737735201863086632 RectTransform: m_ObjectHideFlags: 0 @@ -5753,10 +5753,10 @@ RectTransform: m_Father: {fileID: 199198497822447983} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 412.9, y: -0} - m_SizeDelta: {x: 825.8, y: 64.34} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} + m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3022395328828038287 MonoBehaviour: @@ -6072,9 +6072,9 @@ RectTransform: m_Father: {fileID: 8737735201863086632} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 86.05, y: -26.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 172.1, y: 53.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3662340487375199898 From b0e53312e75af9f3b9614bfb36dc9b019ec907a7 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 21 Jul 2021 17:35:38 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E8=8B=B1=E9=9B=84=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8D=A1=E6=B1=A0=E7=9A=84=E5=A4=A9=E6=95=B0=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 1278 ++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Message/HeroInfoProto_pb.lua | 24 +- .../~Lua/Modules/Net/NetManager.lua | 14 +- .../~Lua/Modules/Popup/GeneralPopup.lua | 2 + .../View/GeneralPopup_NewAddWishHero.lua | 91 ++ .../View/GeneralPopup_NewAddWishHero.lua.meta | 7 + .../~Lua/Modules/Recruit/RecruitManager.lua | 5 +- .../~Lua/Modules/Recruit/RecruitPanelNew.lua | 49 +- 9 files changed, 1441 insertions(+), 30 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 3ec56b412d..1ffbd66094 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -4368,6 +4368,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &632674023580598312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350852453950100046} + - component: {fileID: 6950927255412037988} + - component: {fileID: 3834662863294773764} + m_Layer: 5 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1350852453950100046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632674023580598312} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 0 + 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: 7.2175, y: 28.43} + m_SizeDelta: {x: 135, y: 135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6950927255412037988 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632674023580598312} + m_CullTransparentMesh: 0 +--- !u!114 &3834662863294773764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632674023580598312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 0f7579036915c65459a15fae41f1c712, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &637321774745806346 GameObject: m_ObjectHideFlags: 0 @@ -6190,6 +6264,48 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 999999 +--- !u!1 &1013069210699029238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2315415166303803615} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2315415166303803615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013069210699029238} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1350852453950100046} + - {fileID: 9202689262646350280} + - {fileID: 3709474519660870912} + - {fileID: 8118195223784110723} + - {fileID: 2010002139164445382} + - {fileID: 8539430729001153512} + - {fileID: 3792018250441696649} + m_Father: {fileID: 4894265071051419393} + m_RootOrder: 0 + 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_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1082513354547428325 GameObject: m_ObjectHideFlags: 0 @@ -10834,7 +10950,7 @@ ParticleSystem: --- !u!199 &4135189766867870503 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11165,6 +11281,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E\u8BA4\u732E\u796D" LanguageIndex: 11248 +--- !u!1 &1245743842878105187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722684886015741071} + - component: {fileID: 998340178219248892} + - component: {fileID: 1250433645298289430} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1722684886015741071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245743842878105187} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4627618095225059480} + m_RootOrder: 0 + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &998340178219248892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245743842878105187} + m_CullTransparentMesh: 0 +--- !u!114 &1250433645298289430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245743842878105187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6211\u77E5\u9053\u4E86" + LanguageIndex: 10123 --- !u!1 &1246807704101505575 GameObject: m_ObjectHideFlags: 0 @@ -15353,6 +15549,41 @@ RectTransform: m_AnchoredPosition: {x: -0.000048315, y: -102} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} +--- !u!1 &2136815052755286526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8539430729001153512} + m_Layer: 5 + m_Name: star + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8539430729001153512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136815052755286526} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -10, y: 10} + m_SizeDelta: {x: 142.16, y: 29.089996} + m_Pivot: {x: 0, y: 0} --- !u!1 &2164550483824207619 GameObject: m_ObjectHideFlags: 0 @@ -16082,6 +16313,105 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8BBE \u7F6E" LanguageIndex: 11266 +--- !u!1 &2322405414417316444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3794219042482131108} + - component: {fileID: 2692171972220862856} + - component: {fileID: 1504619491277957116} + - component: {fileID: 6520267838512717643} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3794219042482131108 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322405414417316444} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 2 + 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: -7} + m_SizeDelta: {x: 791.1, y: 324.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2692171972220862856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322405414417316444} + m_CullTransparentMesh: 0 +--- !u!114 &1504619491277957116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322405414417316444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6520267838512717643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322405414417316444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 135, y: 135} + m_Spacing: {x: 50, y: 30} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &2349216250554781233 GameObject: m_ObjectHideFlags: 0 @@ -20227,6 +20557,56 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3329763688016564835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2633210034231626574} + - component: {fileID: 2772998329131654703} + m_Layer: 5 + m_Name: GeneralPopup_NewAddWishHero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2633210034231626574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3329763688016564835} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 435422407707790615} + - {fileID: 4627618095225059480} + - {fileID: 3794219042482131108} + - {fileID: 1899771433267184138} + - {fileID: 4894265071051419393} + - {fileID: 1007230078067798477} + m_Father: {fileID: 2925180131101153177} + m_RootOrder: 37 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {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} +--- !u!222 &2772998329131654703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3329763688016564835} + m_CullTransparentMesh: 0 --- !u!1 &3333024327871228199 GameObject: m_ObjectHideFlags: 0 @@ -20307,6 +20687,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 10407 +--- !u!1 &3352799608929530719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 435422407707790615} + - component: {fileID: 6950626943754804219} + - component: {fileID: 5578541752585001253} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &435422407707790615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3352799608929530719} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 0 + 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: 305} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6950626943754804219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3352799608929530719} + m_CullTransparentMesh: 0 +--- !u!114 &5578541752585001253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3352799608929530719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u63D0 \u793A" + LanguageIndex: 11248 --- !u!1 &3361596915025565561 GameObject: m_ObjectHideFlags: 0 @@ -20920,6 +21380,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3440890980965017326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8118195223784110723} + - component: {fileID: 7568047023274587635} + - component: {fileID: 2112878204121115139} + m_Layer: 5 + m_Name: proIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8118195223784110723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440890980965017326} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 3 + 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: -37, y: 73} + m_SizeDelta: {x: 74, y: 74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7568047023274587635 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440890980965017326} + m_CullTransparentMesh: 0 +--- !u!114 &2112878204121115139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3440890980965017326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 1c666beff78f70943be2712a7f73f982, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3447933801352780087 GameObject: m_ObjectHideFlags: 0 @@ -21212,6 +21746,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3560776341772682680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3709474519660870912} + - component: {fileID: 7344910379085692947} + - component: {fileID: 4790904366008714449} + m_Layer: 5 + m_Name: posIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3709474519660870912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3560776341772682680} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 2 + 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: 57.99994, y: -15.7} + m_SizeDelta: {x: 32, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7344910379085692947 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3560776341772682680} + m_CullTransparentMesh: 0 +--- !u!114 &4790904366008714449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3560776341772682680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b1a92f783ef44174cadd79d112420c8e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3561538225409231181 GameObject: m_ObjectHideFlags: 0 @@ -26369,7 +26977,7 @@ ParticleSystem: --- !u!199 &2405911880013241126 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26696,6 +27304,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3770151868755784706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1007230078067798477} + - component: {fileID: 4903562189231196659} + - component: {fileID: 7619642256605852448} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1007230078067798477 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770151868755784706} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 5 + 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: -214} + m_SizeDelta: {x: 900, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4903562189231196659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770151868755784706} + m_CullTransparentMesh: 0 +--- !u!114 &7619642256605852448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770151868755784706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3791202849240239568 GameObject: m_ObjectHideFlags: 0 @@ -26850,6 +27532,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3802661964640058311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3792018250441696649} + - component: {fileID: 7284673593768972078} + - component: {fileID: 7941074276344815833} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3792018250441696649 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802661964640058311} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 6 + 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: 1.6999817, y: -80.10002} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7284673593768972078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802661964640058311} + m_CullTransparentMesh: 0 +--- !u!114 &7941074276344815833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3802661964640058311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u82F1\u96C4\u4E94\u4E2A\u5B57" + LanguageIndex: 11520 --- !u!1 &3824595028836445608 GameObject: m_ObjectHideFlags: 0 @@ -29282,6 +30044,7 @@ RectTransform: - {fileID: 5289313402946799319} - {fileID: 608091246642945546} - {fileID: 4881501444154533163} + - {fileID: 2633210034231626574} m_Father: {fileID: 4982919456788885506} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29711,6 +30474,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4454529222919505275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1899771433267184138} + - component: {fileID: 3091632634475395770} + - component: {fileID: 5261489394443339906} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1899771433267184138 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4454529222919505275} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 3 + 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: 210} + m_SizeDelta: {x: 896.2, y: 103.95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3091632634475395770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4454529222919505275} + m_CullTransparentMesh: 0 +--- !u!114 &5261489394443339906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4454529222919505275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7411765, g: 0.7294118, b: 0.6117647, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5DF2\u4E0B\u795E\u5C06\u5DF2\u52A0\u5165\u5FC3\u613F\u540D\u5355\uFF1A" + LanguageIndex: 0 --- !u!1 &4502575453775152244 GameObject: m_ObjectHideFlags: 0 @@ -33115,6 +33958,145 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E\u8BA4\u91CD\u7F6E" LanguageIndex: 11251 +--- !u!1 &5461523076545775699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4627618095225059480} + - component: {fileID: 2343109611479150357} + - component: {fileID: 8856851434300897097} + - component: {fileID: 3620910489630372797} + - component: {fileID: 6728702809699303636} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4627618095225059480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5461523076545775699} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1722684886015741071} + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 1 + 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: -286} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2343109611479150357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5461523076545775699} + m_CullTransparentMesh: 0 +--- !u!114 &8856851434300897097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5461523076545775699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3620910489630372797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5461523076545775699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8856851434300897097} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &6728702809699303636 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5461523076545775699} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5558259462214629975 GameObject: m_ObjectHideFlags: 0 @@ -38472,6 +39454,107 @@ RectTransform: m_AnchoredPosition: {x: -0.49996185, y: -2.499999} m_SizeDelta: {x: -0.0050659, y: -0.005024} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6794794417317689372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4894265071051419393} + - component: {fileID: 3889143922058402481} + - component: {fileID: 4521429438706327535} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4894265071051419393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794794417317689372} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2315415166303803615} + m_Father: {fileID: 2633210034231626574} + m_RootOrder: 4 + 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: -759.9, y: 83.3} + m_SizeDelta: {x: 147.49, y: 190.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3889143922058402481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794794417317689372} + m_CullTransparentMesh: 0 +--- !u!114 &4521429438706327535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794794417317689372} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 0 + duration: 0.3 + delay: 0 + curveType: 11 + changeType: 0 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 2315415166303803615} + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 1.15, y: 1.15, z: 1.15} + changeFloat: 0 + duration: 0.3 + delay: 0 + curveType: 0 + changeType: 4 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 2315415166303803615} + - initV3: {x: 1.15, y: 1.15, z: 1.15} + initFloat: 0 + isInit: 0 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.2 + delay: 0 + curveType: 0 + changeType: 4 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 2315415166303803615} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &6836217401114951363 GameObject: m_ObjectHideFlags: 0 @@ -42231,6 +43314,80 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 +--- !u!1 &7768284546656897348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2010002139164445382} + - component: {fileID: 6239550185874950250} + - component: {fileID: 6892316018894612462} + m_Layer: 5 + m_Name: starPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2010002139164445382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768284546656897348} + m_LocalRotation: {x: -0, y: -0, z: -0.67880076, w: 0.7343225} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -85.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -5, y: -83.2} + m_SizeDelta: {x: 32.49, y: 32.49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6239550185874950250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768284546656897348} + m_CullTransparentMesh: 0 +--- !u!114 &6892316018894612462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7768284546656897348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7771301157276515559 GameObject: m_ObjectHideFlags: 0 @@ -50242,6 +51399,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9011371022798230927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9202689262646350280} + - component: {fileID: 6143630603295422257} + - component: {fileID: 8642541827955932455} + - component: {fileID: 6502283565487499770} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9202689262646350280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011371022798230927} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2315415166303803615} + m_RootOrder: 1 + 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: 7.73, y: 28.55} + m_SizeDelta: {x: 124.53, y: 126.17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6143630603295422257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011371022798230927} + m_CullTransparentMesh: 0 +--- !u!114 &8642541827955932455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011371022798230927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ec23e936a0dbfce44826bc67f324ec3b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6502283565487499770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011371022798230927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8642541827955932455} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &9047905622241980413 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cefd34bd31..8d22c674fa 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2069,6 +2069,7 @@ GENERAL_POPUP_TYPE={ YiJingBaoKuConfirm = 31,--易经宝库奖励确认 LingShouBaoGe = 33,--灵兽宝阁选择神兽 YunYouMan = 34,--云游商人选择装备 + NewAddWishHero = 45, --新增的心愿神将提示框 --大号通用弹窗 YiJingBaoKu = 30,--易经宝库 YiJingBaoKuRewardPreview = 32,--易经宝库奖励预览 diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index 199b4f3d91..c8787d3546 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -222,6 +222,8 @@ CHOICEWISHHEROREQUEST = protobuf.Descriptor(); CHOICEWISHHEROREQUEST_INFOLIST_FIELD = protobuf.FieldDescriptor(); CHOICEWISHHERORESPONSE = protobuf.Descriptor(); CHOICEWISHHERORESPONSE_INFOLIST_FIELD = protobuf.FieldDescriptor(); +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD = protobuf.FieldDescriptor(); +CHOICEWISHHERORESPONSE_HEROLIST_FIELD = protobuf.FieldDescriptor(); BEAUTYBAGCARDINDICATION = protobuf.Descriptor(); BEAUTYBAGCARDINDICATION_INFOLIST_FIELD = protobuf.FieldDescriptor(); BEAUTYBAGWISHEQUIPREQUEST = protobuf.Descriptor(); @@ -2198,11 +2200,31 @@ CHOICEWISHHERORESPONSE_INFOLIST_FIELD.message_type = CommonProto_pb.WISHDRAWCARD CHOICEWISHHERORESPONSE_INFOLIST_FIELD.type = 11 CHOICEWISHHERORESPONSE_INFOLIST_FIELD.cpp_type = 10 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.name = "serverOpenTime" +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.full_name = ".rpc.protocols.choiceWishHeroResponse.serverOpenTime" +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.number = 2 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.index = 1 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.label = 1 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.has_default_value = false +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.default_value = 0 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.type = 5 +CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD.cpp_type = 1 + +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.name = "heroList" +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.full_name = ".rpc.protocols.choiceWishHeroResponse.heroList" +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.number = 3 +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.index = 2 +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.label = 3 +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.has_default_value = false +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.default_value = {} +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.type = 5 +CHOICEWISHHERORESPONSE_HEROLIST_FIELD.cpp_type = 1 + CHOICEWISHHERORESPONSE.name = "choiceWishHeroResponse" CHOICEWISHHERORESPONSE.full_name = ".rpc.protocols.choiceWishHeroResponse" CHOICEWISHHERORESPONSE.nested_types = {} CHOICEWISHHERORESPONSE.enum_types = {} -CHOICEWISHHERORESPONSE.fields = {CHOICEWISHHERORESPONSE_INFOLIST_FIELD} +CHOICEWISHHERORESPONSE.fields = {CHOICEWISHHERORESPONSE_INFOLIST_FIELD, CHOICEWISHHERORESPONSE_SERVEROPENTIME_FIELD, CHOICEWISHHERORESPONSE_HEROLIST_FIELD} CHOICEWISHHERORESPONSE.is_extendable = false CHOICEWISHHERORESPONSE.extensions = {} BEAUTYBAGCARDINDICATION_INFOLIST_FIELD.name = "infoList" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index ed32000aac..31b993bf2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5277,12 +5277,14 @@ function NetManager.ChoiceWishHeroRequest(_data,func) end local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.choiceWishHeroRequest, MessageTypeProto_pb.choiceWishHeroResponse, msg, function(buffer) - local data = buffer:DataByte() - local msg = HeroInfoProto_pb.choiceWishHeroResponse() - msg:ParseFromString(data) - RecruitManager.GetWishCardData(msg.infoList) - if func then - func(msg) + local data = buffer:DataByte() + local msg = HeroInfoProto_pb.choiceWishHeroResponse() + msg:ParseFromString(data) + RecruitManager.GetWishCardData(msg.infoList) + RecruitManager.newWishList = msg.heroList--新增的心愿神将list + RecruitManager.openTime = msg.serverOpenTime--开服时间戳或是0(用于判断心愿神将是否加入卡池) + if func then + func(msg) end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index ed7fb1e018..cf508af175 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -73,6 +73,8 @@ local contentScripts = { [35] = {view = require("Modules/Popup/View/GeneralPopup_EndlessPanel"), panelName = "GeneralPopup_EndlessPanel",type=GENERAL_POPUP_TYPE.WuJinSetting}, --up魂印 [36] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpSoul"), panelName = "GeneralPopup_ChooseUpSoul",type=GENERAL_POPUP_TYPE.ChooseUpSoul}, + --新增的心愿神将提示框 + [37] = {view = require("Modules/Popup/View/GeneralPopup_NewAddWishHero"), panelName = "GeneralPopup_NewAddWishHero",type=GENERAL_POPUP_TYPE.NewAddWishHero}, } --子模块预设 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua new file mode 100644 index 0000000000..744628846a --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua @@ -0,0 +1,91 @@ +----- 送神弹窗 ----- +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local args=nil +local currHeroId=0 +local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) +local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) +local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +function this:InitComponent(gameObject) + this.spLoader = SpriteLoader.New() + this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn") + this.prefab=Util.GetGameObject(gameObject,"item") + --滚动条根节点 + this.root = Util.GetGameObject(gameObject, "Root") + this.preList={} +end + +function this:BindEvent() + Util.AddClick(this.confirmBtn,function() + parent:ClosePanel() + end) +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent) + parent=_parent + sortingOrder =_parent.sortingOrder + local heroDatas = RecruitManager.newWishList + for i = 1, math.max(#this.preList,#heroDatas) do + local item=this.preList[i] + if not item then + item=newObject(this.prefab) + item.transform:SetParent(this.root.transform) + item.transform.localScale=Vector3.one + item.transform.localPosition=Vector3.zero + this.preList[i]=item + end + item.gameObject:SetActive(false) + LogRed("heroDatas[i]:"..tostring(heroDatas[i])) + this.SingleHeroDataShow(item,heroConfig[heroDatas[i]]) + end +end + +--英雄单个数据展示 +function this.SingleHeroDataShow(go,_heroData) + local heroData = _heroData + local _go = go + _go.gameObject:SetActive(true) + Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star)) + Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = SubString2(GetLanguageStrById(heroData.ReadingName),8) + Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(artResourcesConfig[_heroData.Icon].Name) + Util.GetGameObject(_go.transform, "posIcon"):SetActive(false) + Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) + local starGrid = Util.GetGameObject(_go.transform, "star") + if _heroData.Id==currHeroId then + this.selectObj.transform:SetParent(_go.transform) + this.selectObj.transform.localScale=Vector3.one + this.selectObj.transform.localPosition=Vector3.New(0,30,0) + end + SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15) + local cardclickBtn = Util.GetGameObject(_go.transform, "icon") + Util.AddOnceClick(cardclickBtn, function() + this.selectObj.transform:SetParent(_go.transform) + this.selectObj.transform.localScale=Vector3.one + this.selectObj.transform.localPosition=Vector3.New(0,30,0) + currHeroId=_heroData.Id + end) + Util.AddLongPressClick(cardclickBtn, function() + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroData.Id, heroData.Star) + end, 0.5) +end + + +function this:OnClose() + currHeroId=0 + args=nil +end + +function this:OnDestroy() + this.spLoader:Destroy() +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua.meta new file mode 100644 index 0000000000..2004459383 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_NewAddWishHero.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a0225cb7f8d89c48aa4a4c022d21c45 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index f87679f195..678340b7f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -36,6 +36,8 @@ function this.Initialize() this.isFirstEnterElementScroll=true this.isFirstEnterHeroScroll=true this.InitPreData() + this.newWishList = {}--心愿抽新增的神将 + this.openTime = 0--开服时间戳或是0(用于判断心愿神将是否加入卡池) end --请求抽卡 1抽卡类型 2回调 3特权id function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum) @@ -496,8 +498,9 @@ end function this.GetCurHeroList(curIndex) local heroList = {} + local time = (GetTimeStamp() - RecruitManager.openTime)/(60*60*24)--开服时间戳或是0(用于判断心愿神将是否加入卡池) for index, v in ipairs(RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.RECRUIT)) do - if heroConfig[v.Reward[1]].Star == 5 and heroConfig[v.Reward[1]].PropertyName == curIndex and heroConfig[v.Reward[1]].Weight > 0 then + if heroConfig[v.Reward[1]].Star == 5 and heroConfig[v.Reward[1]].PropertyName == curIndex and heroConfig[v.Reward[1]].Weight > 0 and time > heroConfig[v.Reward[1]].JoinWishDay then table.insert(heroList,v) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index b5cb96ff3e..5256df4adc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -175,6 +175,7 @@ function RecruitPanelNew:UpdataPanel() self.upper.text=string.format(self.config.TitleText,PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes),privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]) --特权上限 self:UpdatePanelData() self:TimeCountDown() + self:CheckNewWishHero() end function RecruitPanelNew:UpdataWishPanel() @@ -186,17 +187,17 @@ function RecruitPanelNew:UpdataWishPanel() self.wish.gameObject:SetActive(true) --如果没有达到150抽按钮置灰 local data = tonumber(specialConfig[119].Value) - if RecruitManager.drawTimes[1] then - if RecruitManager.drawTimes[1] < data then - self.wishNoOpen.gameObject:SetActive(true) - self.wishOpen.gameObject:SetActive(false) - Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1],data) - self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" - else - self.wishNoOpen.gameObject:SetActive(false) - self.wishOpen.gameObject:SetActive(true) - NetManager.ChoiceWishHeroRequest(nil,function () + NetManager.ChoiceWishHeroRequest(nil,function () + if RecruitManager.drawTimes[1] then + if RecruitManager.drawTimes[1] < data then + self.wishNoOpen.gameObject:SetActive(true) + self.wishOpen.gameObject:SetActive(false) + Util.SetGray(self.wishBtn,true) + self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1],data) + self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" + else + self.wishNoOpen.gameObject:SetActive(false) + self.wishOpen.gameObject:SetActive(true) for i = 1,3 do local data = RecruitManager.WishCardData[i] local id = data.heroTid @@ -224,16 +225,16 @@ function RecruitPanelNew:UpdataWishPanel() PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",tempdata)) end end) - end - end) + end + end + else + self.wishNoOpen.gameObject:SetActive(true) + self.wishOpen.gameObject:SetActive(false) + Util.SetGray(self.wishBtn,true) + self.wishText.text = string.format("%s/%s",0,data) + self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" end - else - self.wishNoOpen.gameObject:SetActive(true) - self.wishOpen.gameObject:SetActive(false) - Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",0,data) - self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" - end + end) self.tenTip:SetActive(true) if RecruitManager.isTenRecruit == 0 then @@ -376,4 +377,12 @@ function RecruitPanelNew:TimeCountDown() end, 1, -1, true) self.timer:Start() end + +--检查是否有新开放的心愿英雄 +function RecruitPanelNew:CheckNewWishHero() + if #RecruitManager.newWishList > 0 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.NewAddWishHero) + end +end + return RecruitPanelNew \ No newline at end of file From 84770437387384303ba26b3b0319527dc3991aa4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 17:38:27 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8B=E6=96=B9=E8=8E=B7=E5=8F=96=E9=80=94?= =?UTF-8?q?=E5=BE=84=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardEquipSingleShowPopup.prefab | 3611 ++++++++--------- 1 file changed, 1805 insertions(+), 1806 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab index dc61e1d374..b10e30b8f1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab @@ -134,7 +134,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 56.52002} - m_SizeDelta: {x: 856.10004, y: 173.4} + m_SizeDelta: {x: 856.10004, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114875536258114214 MonoBehaviour: @@ -380,7 +380,7 @@ RectTransform: - {fileID: 224514219642531126} - {fileID: 224030579528284142} - {fileID: 224173418370625858} - - {fileID: 224805747276523088} + - {fileID: 3854537281981109463} - {fileID: 8365946484409031923} - {fileID: 2553900102717364801} m_Father: {fileID: 224824164786589912} @@ -682,44 +682,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u88C5\u5907\u7279\u6027\uFF1A" LanguageIndex: 0 ---- !u!1 &1176957020435784 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224690604636641256} - m_Layer: 5 - m_Name: getTuPre (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224690604636641256 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176957020435784} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7802613943886106395} - - {fileID: 7802979250009692441} - - {fileID: 7802711716824444747} - m_Father: {fileID: 7803138238525474511} - 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1217536285800870 GameObject: m_ObjectHideFlags: 0 @@ -755,9 +717,9 @@ RectTransform: m_Father: {fileID: 224824164786589912} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 412.9, y: -86.7} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 825.8, y: 173.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114540597203636518 @@ -804,127 +766,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &1278411830333098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224805747276523088} - - component: {fileID: 222635857833750296} - - component: {fileID: 114614287672319894} - - component: {fileID: 114131571162211458} - - component: {fileID: 114830186894474718} - m_Layer: 5 - m_Name: scroll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224805747276523088 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1278411830333098} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7803138238525474511} - m_Father: {fileID: 224311087962942210} - m_RootOrder: 9 - 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: -1.8010254, y: 357} - m_SizeDelta: {x: 912.8, y: 224.5} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &222635857833750296 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1278411830333098} - m_CullTransparentMesh: 0 ---- !u!114 &114614287672319894 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1278411830333098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &114131571162211458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1278411830333098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 7803138238525474511} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 0} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &114830186894474718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1278411830333098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1322871620042112 GameObject: m_ObjectHideFlags: 0 @@ -999,44 +840,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1332632709882412 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224393003175023284} - m_Layer: 5 - m_Name: getTuPre (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224393003175023284 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332632709882412} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7802699953981425289} - - {fileID: 7803252973906360697} - - {fileID: 7803166126766764705} - m_Father: {fileID: 7803138238525474511} - 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1386413588142900 GameObject: m_ObjectHideFlags: 0 @@ -1418,44 +1221,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1505711388677216 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224460113508640358} - m_Layer: 5 - m_Name: getTuPre (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224460113508640358 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505711388677216} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7803270789325085521} - - {fileID: 7802776168136241643} - - {fileID: 7803408416049064389} - m_Father: {fileID: 7803138238525474511} - 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1514650122130964 GameObject: m_ObjectHideFlags: 0 @@ -1939,10 +1704,10 @@ RectTransform: m_Father: {fileID: 224423343333786454} m_RootOrder: 0 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: -15} - m_SizeDelta: {x: 160, y: 30} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222455077862969152 CanvasRenderer: @@ -2835,10 +2600,10 @@ RectTransform: m_Father: {fileID: 8953242912614335389} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 356.8, y: -96.705} - m_SizeDelta: {x: 293.6, y: 61.41} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8005520855150668676 CanvasRenderer: @@ -2916,9 +2681,9 @@ RectTransform: m_Father: {fileID: 1438844812461434258} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -2.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7236434994197682520 @@ -3037,6 +2802,299 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +66 +--- !u!1 &2441775182496819302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4230148348101692552} + - component: {fileID: 1546497409460624547} + - component: {fileID: 6832098821161156656} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4230148348101692552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2441775182496819302} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1911720524701093619} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1546497409460624547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2441775182496819302} + m_CullTransparentMesh: 0 +--- !u!114 &6832098821161156656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2441775182496819302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 +--- !u!1 &2495822194157619638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8085983083780332334} + - component: {fileID: 5590347820505057028} + - component: {fileID: 368460939288998115} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8085983083780332334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2495822194157619638} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4858048105847541554} + m_RootOrder: 0 + 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: 465, y: -67.1} + m_SizeDelta: {x: 912.8, y: 134.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5590347820505057028 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2495822194157619638} + m_CullTransparentMesh: 0 +--- !u!114 &368460939288998115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2495822194157619638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &2870999727179105655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1911720524701093619} + - component: {fileID: 6437665228269118090} + - component: {fileID: 2135801656178861915} + - component: {fileID: 3710745264557181695} + - component: {fileID: 7162961179632878005} + m_Layer: 5 + m_Name: btnSure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1911720524701093619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870999727179105655} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4230148348101692552} + m_Father: {fileID: 4739121873893102984} + m_RootOrder: 2 + 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: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6437665228269118090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870999727179105655} + m_CullTransparentMesh: 0 +--- !u!114 &2135801656178861915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870999727179105655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3710745264557181695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870999727179105655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2135801656178861915} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &7162961179632878005 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870999727179105655} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &3153444220860179435 GameObject: m_ObjectHideFlags: 0 @@ -3191,6 +3249,378 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3352598558702626858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2493609171477332711} + m_Layer: 5 + m_Name: getTuPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2493609171477332711 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3352598558702626858} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8799841246885634659} + - {fileID: 4563516496065187833} + - {fileID: 5641551436042640129} + m_Father: {fileID: 27677360425018048} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &3499493577044429518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2394673774192015012} + - component: {fileID: 1881369731072931514} + - component: {fileID: 1313027068397569628} + - component: {fileID: 4444897832809456110} + - component: {fileID: 3969689084752356904} + m_Layer: 5 + m_Name: btnSure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2394673774192015012 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499493577044429518} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 693690349113808136} + m_Father: {fileID: 4858048105847541554} + m_RootOrder: 2 + 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: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1881369731072931514 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499493577044429518} + m_CullTransparentMesh: 0 +--- !u!114 &1313027068397569628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499493577044429518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4444897832809456110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499493577044429518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1313027068397569628} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &3969689084752356904 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499493577044429518} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3769292495684426385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3854537281981109463} + - component: {fileID: 1460700348995086193} + - component: {fileID: 3789268469368494257} + - component: {fileID: 914073777072033802} + - component: {fileID: 6453604259137445105} + m_Layer: 5 + m_Name: scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3854537281981109463 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769292495684426385} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 27677360425018048} + m_Father: {fileID: 224311087962942210} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 463.10007, y: 355.3} + m_SizeDelta: {x: 912.8, y: 224.5} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1460700348995086193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769292495684426385} + m_CullTransparentMesh: 0 +--- !u!114 &3789268469368494257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769292495684426385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &914073777072033802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769292495684426385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 27677360425018048} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &6453604259137445105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769292495684426385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3895559240518704124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4092359244890516297} + - component: {fileID: 4920306344945014659} + - component: {fileID: 3166556709229043416} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4092359244890516297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3895559240518704124} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4739121873893102984} + m_RootOrder: 0 + 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: 465, y: -67.1} + m_SizeDelta: {x: 912.8, y: 134.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4920306344945014659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3895559240518704124} + m_CullTransparentMesh: 0 +--- !u!114 &3166556709229043416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3895559240518704124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3959550666859776576 GameObject: m_ObjectHideFlags: 0 @@ -3226,6 +3656,284 @@ RectTransform: m_AnchoredPosition: {x: 12.049988, y: 14} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} +--- !u!1 &4081917785318055325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5641551436042640129} + - component: {fileID: 1786804662084395118} + - component: {fileID: 1609548042829000754} + - component: {fileID: 3819428668659916541} + - component: {fileID: 8359677655452965595} + m_Layer: 5 + m_Name: btnSure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5641551436042640129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081917785318055325} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1414291518405336969} + m_Father: {fileID: 2493609171477332711} + m_RootOrder: 2 + 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: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1786804662084395118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081917785318055325} + m_CullTransparentMesh: 0 +--- !u!114 &1609548042829000754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081917785318055325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3819428668659916541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081917785318055325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1609548042829000754} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8359677655452965595 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081917785318055325} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4345473402673577574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 272188401878352178} + - component: {fileID: 52688547584317067} + - component: {fileID: 5263882701508681775} + - component: {fileID: 6603115997705466930} + - component: {fileID: 8991736388978768373} + m_Layer: 5 + m_Name: btnSure + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &272188401878352178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345473402673577574} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5882364314566088509} + m_Father: {fileID: 5179530580483673892} + m_RootOrder: 2 + 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: 757, y: -67.11} + m_SizeDelta: {x: 241.06, y: 96.18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &52688547584317067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345473402673577574} + m_CullTransparentMesh: 0 +--- !u!114 &5263882701508681775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345473402673577574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6603115997705466930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345473402673577574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5263882701508681775} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8991736388978768373 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4345473402673577574} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &4640100456779529899 GameObject: m_ObjectHideFlags: 0 @@ -3300,6 +4008,162 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4751810642462614888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4775806437582280936} + - component: {fileID: 1997317792694652680} + - component: {fileID: 4253992519935402745} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4775806437582280936 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4751810642462614888} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4739121873893102984} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1997317792694652680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4751810642462614888} + m_CullTransparentMesh: 0 +--- !u!114 &4253992519935402745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4751810642462614888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 +--- !u!1 &4791924535226363957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4858048105847541554} + m_Layer: 5 + m_Name: getTuPre (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4858048105847541554 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4791924535226363957} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8085983083780332334} + - {fileID: 5070985380249589782} + - {fileID: 2394673774192015012} + m_Father: {fileID: 27677360425018048} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -320} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &4947230757804236413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5179530580483673892} + m_Layer: 5 + m_Name: getTuPre (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5179530580483673892 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4947230757804236413} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8913702722066128027} + - {fileID: 7237705286776700625} + - {fileID: 272188401878352178} + m_Father: {fileID: 27677360425018048} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -160} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!1 &5448441650619631125 GameObject: m_ObjectHideFlags: 0 @@ -3439,6 +4303,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5561631664329044302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5070985380249589782} + - component: {fileID: 3492894882514663907} + - component: {fileID: 1037464010323693751} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5070985380249589782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5561631664329044302} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4858048105847541554} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3492894882514663907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5561631664329044302} + m_CullTransparentMesh: 0 +--- !u!114 &1037464010323693751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5561631664329044302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 --- !u!1 &5691901718257066863 GameObject: m_ObjectHideFlags: 0 @@ -3473,10 +4417,10 @@ RectTransform: m_Father: {fileID: 1438844812461434258} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 742.96, y: 157.41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 371.48, y: 0} + m_SizeDelta: {x: 742.96, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &136299576013917814 CanvasRenderer: @@ -3524,6 +4468,86 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &5710248170229580485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5882364314566088509} + - component: {fileID: 2999459118061066806} + - component: {fileID: 5903744545157900765} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5882364314566088509 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5710248170229580485} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 272188401878352178} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2999459118061066806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5710248170229580485} + m_CullTransparentMesh: 0 +--- !u!114 &5903744545157900765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5710248170229580485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 --- !u!1 &7082351728534929495 GameObject: m_ObjectHideFlags: 0 @@ -3856,10 +4880,10 @@ RectTransform: m_Father: {fileID: 224824164786589912} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 796, y: 5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 398, y: 0} + m_SizeDelta: {x: 796, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2005831072674522890 MonoBehaviour: @@ -3898,6 +4922,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &7344714024229186955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8913702722066128027} + - component: {fileID: 1628582749047978700} + - component: {fileID: 5848084394514154687} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8913702722066128027 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7344714024229186955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5179530580483673892} + m_RootOrder: 0 + 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: 465, y: -67.1} + m_SizeDelta: {x: 912.8, y: 134.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1628582749047978700 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7344714024229186955} + m_CullTransparentMesh: 0 +--- !u!114 &5848084394514154687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7344714024229186955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7349502655937580265 GameObject: m_ObjectHideFlags: 0 @@ -4052,6 +5150,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A" LanguageIndex: 0 +--- !u!1 &7989099614429147080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7237705286776700625} + - component: {fileID: 7409373763886476563} + - component: {fileID: 7739267187855192331} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7237705286776700625 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989099614429147080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5179530580483673892} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7409373763886476563 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989099614429147080} + m_CullTransparentMesh: 0 +--- !u!114 &7739267187855192331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989099614429147080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 --- !u!1 &8020929945103041257 GameObject: m_ObjectHideFlags: 0 @@ -4126,86 +5304,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8020942464608933187 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802774071035697819} - - component: {fileID: 7801192385920390085} - - component: {fileID: 354882623534927387} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802774071035697819 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020942464608933187} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7803214404571954713} - m_RootOrder: 1 - 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: -318, y: -2.6} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801192385920390085 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020942464608933187} - m_CullTransparentMesh: 0 ---- !u!114 &354882623534927387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020942464608933187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 --- !u!1 &8020948675680217107 GameObject: m_ObjectHideFlags: 0 @@ -4286,458 +5384,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u653B\u51FB" LanguageIndex: 0 ---- !u!1 &8020975360504041013 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802583514796557539} - - component: {fileID: 7801033000478845469} - - component: {fileID: 4269507508667481176} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802583514796557539 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020975360504041013} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7803166126766764705} - m_RootOrder: 0 - 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: -1.44, y: -3.5} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801033000478845469 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020975360504041013} - m_CullTransparentMesh: 0 ---- !u!114 &4269507508667481176 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8020975360504041013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &8021045989910689447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803166937170962501} - - component: {fileID: 7800717767566641037} - - component: {fileID: 5549334998346996028} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803166937170962501 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021045989910689447} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7802711716824444747} - m_RootOrder: 0 - 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: -1.44, y: -3.5} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800717767566641037 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021045989910689447} - m_CullTransparentMesh: 0 ---- !u!114 &5549334998346996028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021045989910689447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &8021083061701061989 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802835115025095467} - - component: {fileID: 7800580802232044225} - - component: {fileID: 7981169364852783345} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802835115025095467 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021083061701061989} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7803214404571954713} - m_RootOrder: 0 - 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800580802232044225 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021083061701061989} - m_CullTransparentMesh: 0 ---- !u!114 &7981169364852783345 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021083061701061989} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!1 &8021085476163255987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803166126766764705} - - component: {fileID: 7800854115795618151} - - component: {fileID: 7983908745167955311} - - component: {fileID: 7980675396383070565} - - component: {fileID: 5895090156248431771} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803166126766764705 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021085476163255987} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7802583514796557539} - m_Father: {fileID: 224393003175023284} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800854115795618151 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021085476163255987} - m_CullTransparentMesh: 0 ---- !u!114 &7983908745167955311 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021085476163255987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &7980675396383070565 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021085476163255987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7983908745167955311} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &5895090156248431771 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021085476163255987} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8021159041964657045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803138238525474511} - - component: {fileID: 7980691016983270417} - - component: {fileID: 7981479351207456097} - m_Layer: 5 - m_Name: grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803138238525474511 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021159041964657045} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7803214404571954713} - - {fileID: 224690604636641256} - - {fileID: 224393003175023284} - - {fileID: 224460113508640358} - m_Father: {fileID: 224805747276523088} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000004381774, y: 0.000003793724} - m_SizeDelta: {x: 807.66, y: 540.45996} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &7980691016983270417 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021159041964657045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: -54 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 912.8, y: 134.2} - m_Spacing: {x: 0, y: 1.22} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &7981479351207456097 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021159041964657045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 --- !u!1 &8021204682983262725 GameObject: m_ObjectHideFlags: 0 @@ -4966,44 +5612,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8021302440115823475 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803214404571954713} - m_Layer: 5 - m_Name: getTuPre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803214404571954713 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021302440115823475} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7802835115025095467} - - {fileID: 7802774071035697819} - - {fileID: 7802798064639149893} - m_Father: {fileID: 7803138238525474511} - 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8021403797714212251 GameObject: m_ObjectHideFlags: 0 @@ -5084,379 +5692,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5957\u88C5\u5C5E\u6027\uFF1A" LanguageIndex: 0 ---- !u!1 &8021463895388851657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803408416049064389} - - component: {fileID: 7801230059604824797} - - component: {fileID: 7980721640554558823} - - component: {fileID: 7981373889856237357} - - component: {fileID: 5894780493296975171} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803408416049064389 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021463895388851657} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7802645513491004621} - m_Father: {fileID: 224460113508640358} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801230059604824797 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021463895388851657} - m_CullTransparentMesh: 0 ---- !u!114 &7980721640554558823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021463895388851657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &7981373889856237357 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021463895388851657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7980721640554558823} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &5894780493296975171 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021463895388851657} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8021472372544580903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802776168136241643} - - component: {fileID: 7801218886657518515} - - component: {fileID: 7374613154796787857} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802776168136241643 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021472372544580903} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224460113508640358} - m_RootOrder: 1 - 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: -318, y: -2.6} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801218886657518515 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021472372544580903} - m_CullTransparentMesh: 0 ---- !u!114 &7374613154796787857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021472372544580903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 ---- !u!1 &8021547840403612151 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802979250009692441} - - component: {fileID: 7800706842990611249} - - component: {fileID: 6570351564897451079} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802979250009692441 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021547840403612151} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224690604636641256} - m_RootOrder: 1 - 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: -318, y: -2.6} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800706842990611249 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021547840403612151} - m_CullTransparentMesh: 0 ---- !u!114 &6570351564897451079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021547840403612151} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 ---- !u!1 &8021551011729338505 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803270789325085521} - - component: {fileID: 7800913849293609143} - - component: {fileID: 7980668813482575761} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803270789325085521 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021551011729338505} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224460113508640358} - m_RootOrder: 0 - 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800913849293609143 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021551011729338505} - m_CullTransparentMesh: 0 ---- !u!114 &7980668813482575761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021551011729338505} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &8021603771010147997 GameObject: m_ObjectHideFlags: 0 @@ -5531,299 +5766,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8021688043752164667 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802613943886106395} - - component: {fileID: 7800601579019236341} - - component: {fileID: 7981055007530246513} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802613943886106395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021688043752164667} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224690604636641256} - m_RootOrder: 0 - 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.000030518, y: -0.0000038147} - m_SizeDelta: {x: 912.8, y: 134.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800601579019236341 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021688043752164667} - m_CullTransparentMesh: 0 ---- !u!114 &7981055007530246513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021688043752164667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!1 &8021714795191427291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803252973906360697} - - component: {fileID: 7800436316178074091} - - component: {fileID: 3135582567563117640} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803252973906360697 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021714795191427291} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224393003175023284} - m_RootOrder: 1 - 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: -318, y: -2.6} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800436316178074091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021714795191427291} - m_CullTransparentMesh: 0 ---- !u!114 &3135582567563117640 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021714795191427291} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u65E0\u540D\u4E4B\u68EE" - LanguageIndex: 0 ---- !u!1 &8021731921603055925 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802711716824444747} - - component: {fileID: 7800585739670544139} - - component: {fileID: 7980762233416773469} - - component: {fileID: 7981138808255080589} - - component: {fileID: 5893074697956797997} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802711716824444747 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021731921603055925} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7803166937170962501} - m_Father: {fileID: 224690604636641256} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800585739670544139 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021731921603055925} - m_CullTransparentMesh: 0 ---- !u!114 &7980762233416773469 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021731921603055925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &7981138808255080589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021731921603055925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7980762233416773469} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &5893074697956797997 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021731921603055925} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8021746637701446729 GameObject: m_ObjectHideFlags: 0 @@ -5983,7 +5925,7 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 4 ---- !u!1 &8021767736345481965 +--- !u!1 &8258421697969704198 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5991,308 +5933,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7802798064639149893} - - component: {fileID: 7801340395998485569} - - component: {fileID: 7981276906101885063} - - component: {fileID: 7980692257646191071} - - component: {fileID: 5894885468338125335} - m_Layer: 5 - m_Name: btnSure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802798064639149893 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021767736345481965} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7803021410559535023} - m_Father: {fileID: 7803214404571954713} - m_RootOrder: 2 - 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: 280, y: 0.13999999} - m_SizeDelta: {x: 241.06, y: 96.18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801340395998485569 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021767736345481965} - m_CullTransparentMesh: 0 ---- !u!114 &7981276906101885063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021767736345481965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &7980692257646191071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021767736345481965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, - type: 3} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7981276906101885063} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &5894885468338125335 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8021767736345481965} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8023075434062036573 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802645513491004621} - - component: {fileID: 7800634758740589449} - - component: {fileID: 4494528553546018887} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7802645513491004621 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023075434062036573} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7803408416049064389} - m_RootOrder: 0 - 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: -1.44, y: -3.5} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800634758740589449 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023075434062036573} - m_CullTransparentMesh: 0 ---- !u!114 &4494528553546018887 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023075434062036573} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &8023129574144586111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7803021410559535023} - - component: {fileID: 7801335829901105717} - - component: {fileID: 834471872677414190} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7803021410559535023 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023129574144586111} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7802798064639149893} - m_RootOrder: 0 - 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: -1.44, y: -3.5} - m_SizeDelta: {x: 157.13, y: 65.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7801335829901105717 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023129574144586111} - m_CullTransparentMesh: 0 ---- !u!114 &834471872677414190 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023129574144586111} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u524D \u5F80" - LanguageIndex: 0 ---- !u!1 &8023149215528817813 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7802699953981425289} - - component: {fileID: 7800740589887036131} - - component: {fileID: 7980960193391824535} + - component: {fileID: 8799841246885634659} + - component: {fileID: 4338069647982175521} + - component: {fileID: 6555427107501969150} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -6300,40 +5943,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7802699953981425289 +--- !u!224 &8799841246885634659 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023149215528817813} + m_GameObject: {fileID: 8258421697969704198} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224393003175023284} + m_Father: {fileID: 2493609171477332711} m_RootOrder: 0 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.000030518, y: -0.0000038147} + m_AnchoredPosition: {x: 465, y: -67.1} m_SizeDelta: {x: 912.8, y: 134.2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7800740589887036131 +--- !u!222 &4338069647982175521 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023149215528817813} + m_GameObject: {fileID: 8258421697969704198} m_CullTransparentMesh: 0 ---- !u!114 &7980960193391824535 +--- !u!114 &6555427107501969150 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8023149215528817813} + m_GameObject: {fileID: 8258421697969704198} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -6356,6 +5999,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8293814985975434965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 693690349113808136} + - component: {fileID: 4921063734557710622} + - component: {fileID: 5596030041267726532} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &693690349113808136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293814985975434965} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2394673774192015012} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4921063734557710622 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293814985975434965} + m_CullTransparentMesh: 0 +--- !u!114 &5596030041267726532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293814985975434965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 --- !u!1 &8523392148239437350 GameObject: m_ObjectHideFlags: 0 @@ -6430,6 +6153,202 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8606419450731025789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4739121873893102984} + m_Layer: 5 + m_Name: getTuPre (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4739121873893102984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8606419450731025789} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4092359244890516297} + - {fileID: 4775806437582280936} + - {fileID: 1911720524701093619} + m_Father: {fileID: 27677360425018048} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -45, y: -480} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &9008515335726241948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1414291518405336969} + - component: {fileID: 6043471186749689881} + - component: {fileID: 5126395033969789925} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1414291518405336969 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008515335726241948} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5641551436042640129} + m_RootOrder: 0 + 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: 2.9, y: -3.5} + m_SizeDelta: {x: 183.5, y: 65.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6043471186749689881 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008515335726241948} + m_CullTransparentMesh: 0 +--- !u!114 &5126395033969789925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9008515335726241948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D \u5F80" + LanguageIndex: 0 +--- !u!1 &9009329642938400441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 27677360425018048} + - component: {fileID: 7331496068879373932} + - component: {fileID: 4317155639266564529} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &27677360425018048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009329642938400441} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2493609171477332711} + - {fileID: 5179530580483673892} + - {fileID: 4858048105847541554} + - {fileID: 4739121873893102984} + m_Father: {fileID: 3854537281981109463} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 36.81, y: 0.000012533355} + m_SizeDelta: {x: 912.79004, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &7331496068879373932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009329642938400441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &4317155639266564529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9009329642938400441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: -45 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 160 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &9072185780785876642 GameObject: m_ObjectHideFlags: 0 @@ -6649,3 +6568,83 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4F7F \u7528" LanguageIndex: 0 +--- !u!1 &9103313176053292380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4563516496065187833} + - component: {fileID: 5738014836658815554} + - component: {fileID: 3442358464531616462} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4563516496065187833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9103313176053292380} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2493609171477332711} + m_RootOrder: 1 + 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: 309, y: -67.1} + m_SizeDelta: {x: 562.6, y: 96.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5738014836658815554 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9103313176053292380} + m_CullTransparentMesh: 0 +--- !u!114 &3442358464531616462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9103313176053292380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 38 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u540D\u4E4B\u68EE" + LanguageIndex: 0 From 1d2ed2a4f78394d2e4fe5d1c65cd2ddc2526dede Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 18:03:23 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8B=E6=96=B9=E8=8E=B7=E5=8F=96=E9=80=94?= =?UTF-8?q?=E5=BE=84=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardEquipSingleShowPopup.prefab | 15 -------- .../RewardTalismanSingleShowPopup.prefab | 17 +-------- .../Popup/RewardEquipSingleShowPopup.lua | 36 ++++++++++++++++--- .../Popup/RewardTalismanSingleShowPopup.lua | 32 ++++++++++++++--- 4 files changed, 59 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab index b10e30b8f1..ab38638738 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup.prefab @@ -6280,7 +6280,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 27677360425018048} - - component: {fileID: 7331496068879373932} - component: {fileID: 4317155639266564529} m_Layer: 5 m_Name: grid @@ -6312,20 +6311,6 @@ RectTransform: m_AnchoredPosition: {x: 36.81, y: 0.000012533355} m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &7331496068879373932 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9009329642938400441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 --- !u!114 &4317155639266564529 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index 98f3dda37e..ce8f19b15e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -363,7 +363,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 198231294764616417} - - component: {fileID: 349189508491785637} - component: {fileID: 7871582414776459346} m_Layer: 5 m_Name: grid @@ -392,23 +391,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 36.81, y: -0.00004825481} + m_AnchoredPosition: {x: 36.81, y: 0.000012766568} m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &349189508491785637 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133032757010905065} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 --- !u!114 &7871582414776459346 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua index a2f508c8ad..94b3023bd9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua @@ -39,6 +39,7 @@ function RewardEquipSingleShowPopup:InitComponent() --装备获取途径 --this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre") this.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid") + this.equipProGridCom =this.getTuGrid:GetComponent("VerticalLayoutGroup") --装备被动技能 this.skillObject=Util.GetGameObject(self.transform, "Content/skillObject") this.skillInfo=Util.GetGameObject(self.transform, "Content/skillObject/skillInfo"):GetComponent("Text") @@ -221,20 +222,34 @@ function RewardEquipSingleShowPopup:OnShow() else Util.GetGameObject(self.transform, "Content/proRect"):SetActive(false) end - --装备获得途径 - Util.ClearChild(this.getTuGrid.transform) + + if this.jumpViewList and #this.jumpViewList > 0 then + for i = 1,#this.jumpViewList do + SubUIManager.Close(this.jumpViewList[i]) + end + end + this.jumpViewList = {} + local curitemData = itemConfig[tonumber(equipData.id)] if curitemData and curitemData.Jump then if curitemData.Jump and #curitemData.Jump>0 then for i = 1, #curitemData.Jump do + local tempView = nil if isRewardItemPop then - SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],false) + tempView = SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],false) else - SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],true) + tempView = SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],true) + end + if tempView then + table.insert(this.jumpViewList,tempView) end end end end + this.equipProGridCom.spacing = 150 + if this.jumpViewList and #this.jumpViewList then + this.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,this.equipProGridCom.spacing*(#this.jumpViewList)) + end end --道具 和 装备分解 发送请求后 回调 function this.SendBackResolveReCallBack(drop) @@ -274,7 +289,12 @@ function RewardEquipSingleShowPopup:OnLockClickEvent() end --界面关闭时调用(用于子类重写) function RewardEquipSingleShowPopup:OnClose() - + if this.jumpViewList and #this.jumpViewList > 0 then + for i = 1,#this.jumpViewList do + SubUIManager.Close(this.jumpViewList[i]) + end + end + this.jumpViewList = {} --if func then -- func() --end @@ -285,6 +305,12 @@ function RewardEquipSingleShowPopup:OnDestroy() this.spLoader:Destroy() curSuitProGo = {} _MainProList = {} + if this.jumpViewList and #this.jumpViewList > 0 then + for i = 1,#this.jumpViewList do + SubUIManager.Close(this.jumpViewList[i]) + end + end + this.jumpViewList = {} end return RewardEquipSingleShowPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua index 033b7c8263..3fb6dd3a15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua @@ -37,6 +37,7 @@ function RewardTalismanSingleShowPopup:InitComponent() --装备获取途径 --this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre") self.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid") + self.equipProGridCom = self.getTuGrid:GetComponent("VerticalLayoutGroup") end --绑定事件(用于子类重写) @@ -193,16 +194,27 @@ function RewardTalismanSingleShowPopup:OnShowPanelData() self.curotherProscroll:SetActive(false) end - --装备获得途径 - Util.ClearChild(self.getTuGrid.transform) + + if self.jumpViewList and #self.jumpViewList > 0 then + for i = 1,#self.jumpViewList do + SubUIManager.Close(self.jumpViewList[i]) + end + end + self.jumpViewList = {} + local curitemData = itemConfig if curitemData and curitemData.Jump then if curitemData.Jump and #curitemData.Jump>0 then for i = 1, #curitemData.Jump do - SubUIManager.Open(SubUIConfig.JumpView, self.getTuGrid.transform, curitemData.Jump[i]) + local temp = SubUIManager.Open(SubUIConfig.JumpView, self.getTuGrid.transform, curitemData.Jump[i]) + table.insert(self.jumpViewList,temp) end end end + self.equipProGridCom.spacing = 150 + if self.jumpViewList and #self.jumpViewList then + self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList)) + end end --道具 和 装备分解 发送请求后 回调 function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop) @@ -227,7 +239,12 @@ function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop) end --界面关闭时调用(用于子类重写) function RewardTalismanSingleShowPopup:OnClose() - + if self.jumpViewList and #self.jumpViewList > 0 then + for i = 1,#self.jumpViewList do + SubUIManager.Close(self.jumpViewList[i]) + end + end + self.jumpViewList = {} if func then func() end @@ -253,7 +270,12 @@ end --界面销毁时调用(用于子类重写) function RewardTalismanSingleShowPopup:OnDestroy() self.spLoader:Destroy() - + if self.jumpViewList and #self.jumpViewList > 0 then + for i = 1,#self.jumpViewList do + SubUIManager.Close(self.jumpViewList[i]) + end + end + self.jumpViewList = {} end return RewardTalismanSingleShowPopup \ No newline at end of file From 183cd238d3fcdd801c9696deaa35cbcf3608e1b3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 21 Jul 2021 18:22:24 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab | 2 +- .../ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 1ffbd66094..c5d97fa27e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -30546,7 +30546,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 7 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 5256df4adc..4f76af3433 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -175,7 +175,6 @@ function RecruitPanelNew:UpdataPanel() self.upper.text=string.format(self.config.TitleText,PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes),privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]) --特权上限 self:UpdatePanelData() self:TimeCountDown() - self:CheckNewWishHero() end function RecruitPanelNew:UpdataWishPanel() @@ -234,6 +233,7 @@ function RecruitPanelNew:UpdataWishPanel() self.wishText.text = string.format("%s/%s",0,data) self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" end + self:CheckNewWishHero() end) self.tenTip:SetActive(true) @@ -380,6 +380,7 @@ end --检查是否有新开放的心愿英雄 function RecruitPanelNew:CheckNewWishHero() + LogGreen("CheckNewWishHero") if #RecruitManager.newWishList > 0 then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.NewAddWishHero) end From 2b08ff111eb0761753be16c9a756dcb2b062ddbd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 21 Jul 2021 18:26:12 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E5=8E=BB=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 4f76af3433..7be3319532 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -380,7 +380,6 @@ end --检查是否有新开放的心愿英雄 function RecruitPanelNew:CheckNewWishHero() - LogGreen("CheckNewWishHero") if #RecruitManager.newWishList > 0 then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.NewAddWishHero) end From c131d41d587cb46ba9e68631acf2dfad5ca3006b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 21 Jul 2021 18:27:03 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 10 +- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 105 +++++++++--------- 2 files changed, 60 insertions(+), 55 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index eec3ccb7c0..b9802d7a9b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -144984,7 +144984,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &268016902880247916 RectTransform: m_ObjectHideFlags: 0 @@ -145000,10 +145000,10 @@ RectTransform: m_Father: {fileID: 224358324289722092} 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: 97.10004, y: -82} + m_SizeDelta: {x: 155, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1834664782885917125 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 7774246785..377ebe1828 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -32,7 +32,7 @@ local curHeroData local heroListData local curSelectEquipData local index -local indexBtnNum = 0 +local indexBtnNum = 1 local typeTab = { [0] = Language[10175], [1] = Language[10391], @@ -86,7 +86,7 @@ function RoleEquipPanel:InitComponent() end --装备list this.effect = Util.GetGameObject(self.transform, "bg/effect") - for i = 0, 6 do + for i = 1, 6 do tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i) Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 48 or 40 effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect") @@ -192,7 +192,7 @@ function RoleEquipPanel:BindEvent() end ) - for i = 0, 6 do + for i = 1, 6 do Util.AddClick( tabs[i], function() @@ -201,11 +201,12 @@ function RoleEquipPanel:BindEvent() return end indexBtnNum = i - if indexBtnNum == PosIdConst.All then - this:OnClickAllBtn() - else - this:OnClickTabBtn(indexBtnNum) - end + this:OnClickTabBtn(indexBtnNum) + -- if indexBtnNum == PosIdConst.All then + -- this:OnClickAllBtn() + -- else + -- this:OnClickTabBtn(indexBtnNum) + -- end end ) end @@ -247,11 +248,12 @@ end function this.CurrEquipDataChange() this.ShowHeroEquip() - if indexBtnNum == PosIdConst.All then - this:OnClickAllBtn() - else - this:OnClickTabBtn(indexBtnNum) - end + this:OnClickTabBtn(indexBtnNum) + -- if indexBtnNum == PosIdConst.All then + -- this:OnClickAllBtn() + -- else + -- this:OnClickTabBtn(indexBtnNum) + -- end end --界面打开时调用(用于子类重写) @@ -284,10 +286,10 @@ function RoleEquipPanel:OnShow() effectList[i]:SetActive(false) end end - indexBtnNum = PosIdConst.All + indexBtnNum = PosIdConst.WuQi teamHero = FormationManager.GetAllMainFormationHeroId() this.ShowHeroEquip(true) - this:OnClickAllBtn() + this:OnClickTabBtn(indexBtnNum) this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) end @@ -301,22 +303,24 @@ function this:RightBtnOnClick() index = (index + 1 <= #heroListData and index + 1 or 1) curHeroData = heroListData[index] this.ShowHeroEquip() - if indexBtnNum == PosIdConst.All then - this:OnClickAllBtn() - else - this:OnClickTabBtn(indexBtnNum) - end + this:OnClickTabBtn(indexBtnNum) + -- if indexBtnNum == PosIdConst.All then + -- this:OnClickAllBtn() + -- else + -- this:OnClickTabBtn(indexBtnNum) + -- end end --左切换按钮点击 function this:LeftBtnOnClick() index = (index - 1 > 0 and index - 1 or #heroListData) curHeroData = heroListData[index] this.ShowHeroEquip() - if indexBtnNum == PosIdConst.All then - this:OnClickAllBtn() - else - this:OnClickTabBtn(indexBtnNum) - end + this:OnClickTabBtn(indexBtnNum) + -- if indexBtnNum == PosIdConst.All then + -- this:OnClickAllBtn() + -- else + -- this:OnClickTabBtn(indexBtnNum) + -- end end --一键装备 @@ -716,25 +720,25 @@ function this:UpdateEquipItem(go,data,lvObj,refineObj) end EquipManager.SetEquipStarShow(this.spLoader, Util.GetGameObject(go.transform, "frame/star"),data.itemConfig.Id) end ---点击全部按钮 -function this:OnClickAllBtn() - this:SetSelectBtn() - local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession) - this:SortEquipDatas(itemData) - local count = 0 - for i=1,#itemData do - count = count + 1--itemData[i].num - end - --加上宝器数据 - local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName) - --宝器排序 - for i = 1, #curAllEquipTreasure do - table.insert(itemData, curAllEquipTreasure[i]) - end - --"装备数量:" - this.itemNumText.text = Language[12181] .. count + LengthOfTable(curAllEquipTreasure) - this:SetItemData(itemData) -end +-- --点击全部按钮 +-- function this:OnClickAllBtn() +-- this:SetSelectBtn() +-- local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession) +-- this:SortEquipDatas(itemData) +-- local count = 0 +-- for i=1,#itemData do +-- count = count + 1--itemData[i].num +-- end +-- --加上宝器数据 +-- local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName) +-- --宝器排序 +-- for i = 1, #curAllEquipTreasure do +-- table.insert(itemData, curAllEquipTreasure[i]) +-- end +-- --"装备数量:" +-- this.itemNumText.text = Language[12181] .. count + LengthOfTable(curAllEquipTreasure) +-- this:SetItemData(itemData) +-- end --点击装备按钮 function this:OnClickTabBtn(_index) @@ -1076,12 +1080,13 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi this.ShowHeroEquip() --上阵刷新红点 this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and isUpZhen) - --刷新当前英雄可穿装备 - if indexBtnNum == PosIdConst.All then - this:OnClickAllBtn() - else - this:OnClickTabBtn(indexBtnNum) - end + this:OnClickTabBtn(indexBtnNum) + -- --刷新当前英雄可穿装备 + -- if indexBtnNum == PosIdConst.All then + -- this:OnClickAllBtn() + -- else + -- this:OnClickTabBtn(indexBtnNum) + -- end --对比战力并更新战力值 播放战力变更动画 HeroManager.CompareWarPower(curHeroData.dynamicId) end From 683e0eefc45ec0e97c24fdd5ecfbba296a4de782 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 21 Jul 2021 18:37:15 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index c5d97fa27e..24c54eabae 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -16348,7 +16348,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: -7} + m_AnchoredPosition: {x: 0, y: -30} m_SizeDelta: {x: 791.1, y: 324.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2692171972220862856 @@ -27549,7 +27549,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3792018250441696649 RectTransform: m_ObjectHideFlags: 0 @@ -27566,7 +27566,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: 1.6999817, y: -80.10002} + m_AnchoredPosition: {x: 1.6999817, y: -60} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7284673593768972078 @@ -30508,7 +30508,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: 210} + m_AnchoredPosition: {x: 0, y: 165} m_SizeDelta: {x: 896.2, y: 103.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3091632634475395770 From e28d5385654f04db53d2906fc8969f82b885bf74 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 22 Jul 2021 10:23:09 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E5=A4=84=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Textures/fx_tex_xinguang.png | Bin 85666 -> 0 bytes .../Textures/fx_tex_xinguang.png.meta | 110 ------------------ 2 files changed, 110 deletions(-) delete mode 100644 Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png delete mode 100644 Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta diff --git a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png b/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png deleted file mode 100644 index f43238e9e39939974cbbb1a05bb8192168e89bd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85666 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 z 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 diff --git a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta b/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta deleted file mode 100644 index 75ce055470..0000000000 --- a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: a26b2cd667514dd4bb33d0e266e79a3d -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: df99d8df15200ae469aa15fc5927e2c7 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: From b7d7b3270aa5f9bb6f7aafb24eae1c25ca85fb5f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Jul 2021 10:36:35 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E3=80=90=E4=B8=BB=E9=A2=98=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E3=80=91=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Recruit/RecruitPanelNew.prefab | 6 +++--- .../DynamicActivity/ActivityMainPanel.lua | 10 +++++++++- .../~Lua/Modules/NewActivity/CommonActPage.lua | 16 ++++++++++------ .../Modules/NewActivity/CommonActPageManager.lua | 3 ++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index d7584eeb8b..9e0b81b55f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -934,7 +934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189879797113255339} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -11256,7 +11256,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2671413894708845251} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -21578,7 +21578,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3915160258044306129} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index c063bed004..694864d937 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -272,6 +272,10 @@ function this.OnPageTabChange(index) subViewList[_CurPageIndex].sub:OnClose() end if subViewList[index] and subViewList[index].config and subViewList[index].sub then + --每日每周任务页签拆分用 + if tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) else subViewList[index] = {} @@ -279,8 +283,12 @@ function this.OnPageTabChange(index) if tabs[index].UIName then subViewList[index].config = SubUIConfig[tabs[index].UIName[1]] subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this) + --每日每周任务页签拆分用 + if tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) - end + end end if tabs[index].UpView and #tabs[index].UpView > 0 then this.upView:OnOpen({showType = tabs[index].UpView[1][1], panelType = tabs[index].UpView[2] }) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 9c77e2a3dd..389d02ebf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -76,21 +76,25 @@ function CommonActPage:OnShow(_sortingOrder) self.sortingOrder = _sortingOrder or self.sortingOrder self.actId = self.actConfig.ActId self.actType = self.actConfig.ActiveType + --每日每周任务页签拆分用 + if self.actConfig.ShopData[1][1] == -9999 then + self.actType = 20000 + end if self.actConfig.IfBack == 1 then - if self.actConfig.ActiveType > 0 then - local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) + if self.actType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(self.actType) if id and id > 0 then self.actId = id local actConfig - local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actType) if not actConfig then - actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actType) end if actConfig then self.actConfig = actConfig end else - LogRed("活动类型:"..tostring(self.actConfig.ActiveType).."的活动未开启") + LogRed("活动类型:"..tostring(self.actType).."的活动未开启") end end end @@ -165,7 +169,7 @@ function CommonActPage:OnShow(_sortingOrder) end --刷新数据 function CommonActPage:RefreshData(isUpdata,isTop,isAni) - self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType) + self.ActData = CommonActPageManager.GetData(self.actType) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9bb9401a15..11916355d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -3,6 +3,7 @@ local this = CommonActPageManager local dataList = {} this.TaSuiLingXiaoMsg = nil this.TaSuiLingXiaoHistoryDmg = 0 +this.DynamicActType = 1 function this.Initialize() end @@ -243,7 +244,7 @@ function this.InitTaskData(curData,taskType,configName) local allMissionData = TaskManager.GetTypeTaskList(taskType) for i=1,#allListData do for j=1,#allMissionData do - if allListData[i].Id == allMissionData[j].missionId then + if allListData[i].Id == allMissionData[j].missionId and allListData[i].Type == this.DynamicActType then local data = {} data.missionId = allMissionData[j].missionId data.taskType = taskType From 5fa9f25c0978b558cd783c0e075a0b1202fa9e2d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Jul 2021 10:53:27 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E3=80=90=E7=82=B9=E5=B0=86=E5=8F=B0?= =?UTF-8?q?=E3=80=91=E7=99=BD=E7=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab | 2 +- .../ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 24c54eabae..2049bec41b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -30552,7 +30552,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5DF2\u4E0B\u795E\u5C06\u5DF2\u52A0\u5165\u5FC3\u613F\u540D\u5355\uFF1A" + m_Text: "\u4EE5\u4E0B\u795E\u5C06\u5DF2\u52A0\u5165\u5FC3\u613F\u540D\u5355\uFF1A" LanguageIndex: 0 --- !u!1 &4502575453775152244 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 7be3319532..dc00380a62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -64,6 +64,7 @@ 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.gameObject:SetActive(false) self.upHeroPreList[i].item.transform:SetSiblingIndex(0) self.upHeroPreList[i].choosed = Util.GetGameObject(self.upHeroPreList[i].go,"state") end From 63c2a33c84ea8f0c37910e391a0f0c785913cb0d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Jul 2021 11:40:13 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E3=80=90=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 4 ++-- .../~Lua/Modules/NewActivity/CommonActPage.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 694864d937..95fdbc7fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -273,7 +273,7 @@ function this.OnPageTabChange(index) end if subViewList[index] and subViewList[index].config and subViewList[index].sub then --每日每周任务页签拆分用 - if tabs[index].ShopData[1][1] == -9999 then + if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then CommonActPageManager.DynamicActType = tabs[index].ActId end subViewList[index].sub:OnShow(orginLayer) @@ -284,7 +284,7 @@ function this.OnPageTabChange(index) subViewList[index].config = SubUIConfig[tabs[index].UIName[1]] subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this) --每日每周任务页签拆分用 - if tabs[index].ShopData[1][1] == -9999 then + if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then CommonActPageManager.DynamicActType = tabs[index].ActId end subViewList[index].sub:OnShow(orginLayer) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 389d02ebf0..3c17e00c44 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -77,7 +77,7 @@ function CommonActPage:OnShow(_sortingOrder) self.actId = self.actConfig.ActId self.actType = self.actConfig.ActiveType --每日每周任务页签拆分用 - if self.actConfig.ShopData[1][1] == -9999 then + if self.actConfig.ShopData and self.actConfig.ShopData[1][1] == -9999 then self.actType = 20000 end if self.actConfig.IfBack == 1 then From ce8751bbee98aca76f244c42d51e61b28b24d3d4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 22 Jul 2021 14:17:40 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92=20?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua | 4 ++-- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua | 3 ++- .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index 810a77a905..7a350206f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -133,7 +133,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) local itemId=0 local itemNum=0 local d - local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType) + local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen if upConfig then local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) if wish then @@ -143,6 +143,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) isLimitUpHero=true end else + isLimitUpHero = false this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) d = RecruitManager.GetExpendData(this.recruitType) end @@ -178,7 +179,6 @@ function QianKunBoxBuyOnePanel:OnOpen(...) end --界面关闭时调用(用于子类重写) function QianKunBoxBuyOnePanel:OnClose() - end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index 2b559505dc..48a0f3bbc2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -143,7 +143,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) local itemId=0 local itemNum=0 local d - local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType) + local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen if upConfig then local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) if wish then @@ -157,6 +157,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) d = RecruitManager.GetExpendDataByCostItem(wish.CostItemMul,2,num) end else + isLimitUpHero = false d = RecruitManager.GetExpendData(this.recruitType) if this.UpView then SubUIManager.Close(this.UpView) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 8639a7bd02..578963a1d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -287,10 +287,10 @@ function TimeLimitUpHero:Recruit(actId,type,itemId) PrivilegeManager.RefreshPrivilegeUsedTimes(self.yaojingMaxTimeId,recrutType)--记录妖晶抽卡次数 end if type == 1 then - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc) + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,RecruitType.PrayerSingle,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc) else --UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,type,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen}) - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc) + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,RecruitType.PrayerTen,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc) end -- if msg.drop.Hero[1] then -- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2)