From 963591b530ff7da66d8bb7630c2697e4861c2470 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 7 Jan 2022 18:21:10 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E3=80=90=E5=8A=A8=E7=94=BB=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E5=AF=BC=E8=87=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=88=97=E8=A1=A8=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 --- .../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 74c5a631aa..664dcf5b0a 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -30752,19 +30752,6 @@ MonoBehaviour: loop: 0 loopType: 0 targetObj: {fileID: 0} - - initV3: {x: 0, y: 0, z: 0} - initFloat: 0 - isInit: 0 - changeV3: {x: 0, y: 0, z: 0} - changeFloat: 1 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 8 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 0} - initV3: {x: 0.95, y: 0.95, z: 0.95} initFloat: 0 isInit: 0 From f3e9d3b2a5f84cdeda24e03997f526bff3345354 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 7 Jan 2022 18:22:23 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 528a831fee..91620a0deb 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -20,23 +20,22 @@ local TypeUpdateFunc = { curData.rewards[i].otherData.needItems = configData[j].NeedItems curData.rewards[i].otherData.count = configData[j].Count curData.rewards[i].otherData.composeType = configData[j].ComposeType + curData.rewards[i].otherData.Sort = configData[j].Sort curData.rewards[i].otherData.IsShowItem = configData[j].IsShowItem == 1 and true or false curData.rewards[i].otherData.selectId = 0 end end end table.sort(dataList[ActivityTypeDef.YunYouShangRen].rewards,function (a,b) - if a.progress == 0 and b.progress > 0 then + if a.progress == 0 and b.progress > 0 then return false end if a.progress > 0 and b.progress == 0 then return true end - return a.missionId < b.missionId - -- if a.progress == b.progress then - -- else - -- return a.progress > b.progress - -- end + if (a.progress == 0 and b.progress == 0) or (a.progress > 0 and b.progress > 0) then + return a.otherData.Sort < b.otherData.Sort + end end) end, [ActivityTypeDef.ContinuityRecharge] = function () From 2ad247d4f9a38cacc90edd54de631bc404f88ec4 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 7 Jan 2022 18:27:57 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E8=81=8C=E4=B8=9A=E5=9B=BE=E6=A0=87=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png | Bin 5546 -> 6261 bytes .../PublicAtlas/r_hero_konghzibiao_hl.png | Bin 4526 -> 5374 bytes .../PublicAtlas/r_hero_roudunbiao_hl.png | Bin 6251 -> 6006 bytes .../PublicAtlas/r_hero_shuchubiao_hl.png | Bin 4591 -> 5442 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png index 4e5d8696a9b5be40e8a2ebc12694cba3e586c7bd..72915a59f12546d752d8cc43c633beae9b0e1487 100644 GIT binary patch literal 6261 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 diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_konghzibiao_hl.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_konghzibiao_hl.png index 7cc30c1575168c8940fb719dcf56253c45187429..58425547aa46fc0b76b24b2e35add67465edca9a 100644 GIT binary patch literal 5374 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 literal 4526 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 literal 6251 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

w+CkfZ(+BN)e5tJ08`sCbvdaO*w&BlEyUX~a; z+E4xWe@LLCm#&^ThH+}oN?1unx~nIlp5L(edWeMF*jx2Eu`*eAS@)1~=F6G55s9<< zuWnLg2Kxt2*+32nVsRlIqkhps*QceAvs|aglgYfjyo({ThNMk?_&BR>_-jfA9rql2 ztQ?NBr|n~C>!kjhLV60S?F9PtSefjL`UfzrTCiF|p&tJBs%uz!-M3ZXvf;I-)nVB) zKUqbPeEM2HWy80=4B-M)8^3=-eR{0q;#)}jFjMmw=qHlj&Wdj=!f1Cl5$HPrkx&`tDThz0Y;L~FzSKmU~G8zpI641+ zDe8f{M%9=s0$$D~h|l9ImM1$IOywFxt|qrkIeJ1(GPh=qBHo&7m26|Cy6%$BO}BHv z`ZU)d{8VP~)Wk{)@N3{^xi26Yyj)$$H3*+GnDfca{huJ Date: Fri, 7 Jan 2022 19:34:07 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E4=BC=98=E5=8C=96=E3=80=91=E7=95=8C=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E5=8F=AF=E9=A2=84=E8=A7=88=E5=BD=93=E5=89=8D=E7=A5=9E=E5=BA=94?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=92=8C=E4=B8=8B=E7=BA=A7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/SacredTree/SacredTreePanel.prefab | 3956 ++++++++++++++++- .../Modules/SacredTree/SacredTreeManager.lua | 37 + .../Modules/SacredTree/SacredTreePanel.lua | 183 +- 3 files changed, 3929 insertions(+), 247 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab index cf50b1ba21..dc4155cbaf 100644 --- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab @@ -1,5 +1,167 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &78440144849335386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5441580854153997261} + - component: {fileID: 8119856133327606090} + - component: {fileID: 1058221350210807981} + m_Layer: 0 + m_Name: attriPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5441580854153997261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78440144849335386} + 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: 2862046777434801659} + - {fileID: 5868104094930413599} + m_Father: {fileID: 2501277849694378237} + 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: 540, y: -25} + m_SizeDelta: {x: 1080, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8119856133327606090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78440144849335386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 1080 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1058221350210807981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78440144849335386} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 90, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 1 + duration: 0.5 + delay: 0.2 + curveType: 1 + changeType: 3 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 5441580854153997261} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 +--- !u!1 &155753282191485613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3557044460126474493} + - component: {fileID: 6934384742473119238} + - component: {fileID: 3905235916219828892} + m_Layer: 0 + m_Name: Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3557044460126474493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 155753282191485613} + 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: 1175978126237019005} + 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: -100, y: 0} + m_SizeDelta: {x: 74, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6934384742473119238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 155753282191485613} + m_CullTransparentMesh: 0 +--- !u!114 &3905235916219828892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 155753282191485613} + 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: 84b137e960461f44082b1491d6ce5b7b, 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 &307168082075356620 GameObject: m_ObjectHideFlags: 0 @@ -32,7 +194,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8234046456925150097} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -137,7 +299,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &542675450510525491 +--- !u!1 &554682230907818902 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -145,78 +307,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4083153808900089139} - - component: {fileID: 5636756249558328025} - - component: {fileID: 6779578638181366870} + - component: {fileID: 733609824389259095} + - component: {fileID: 635353161501257530} + - component: {fileID: 8220151195414339847} m_Layer: 0 - m_Name: Text + m_Name: Select m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4083153808900089139 +--- !u!224 &733609824389259095 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542675450510525491} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 554682230907818902} + 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: 767042923798504073} + m_Father: {fileID: 12403259772440414} m_RootOrder: 1 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -100, y: 0} + m_SizeDelta: {x: 74, y: 62} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5636756249558328025 +--- !u!222 &635353161501257530 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542675450510525491} + m_GameObject: {fileID: 554682230907818902} m_CullTransparentMesh: 0 ---- !u!114 &6779578638181366870 +--- !u!114 &8220151195414339847 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542675450510525491} + m_GameObject: {fileID: 554682230907818902} 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.14117648, g: 0.19607845, b: 0.2392157, a: 1} - m_RaycastTarget: 1 + 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 48 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5347 \u7EA7" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, 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 &669462346247476097 GameObject: m_ObjectHideFlags: 0 @@ -251,7 +407,7 @@ RectTransform: - {fileID: 4721194798677964041} - {fileID: 3518057561376129305} m_Father: {fileID: 8234046456925150097} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -356,6 +512,65 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &781113004129056943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1175978126237019005} + - component: {fileID: 4578162921907038261} + m_Layer: 0 + m_Name: Pre (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1175978126237019005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781113004129056943} + 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: 5992950636659197194} + - {fileID: 3557044460126474493} + - {fileID: 8486956048799115265} + m_Father: {fileID: 4546675241244705144} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4578162921907038261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781113004129056943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 300 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &887841620342110426 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +601,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1123873614442330117} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -430,7 +645,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1306023313800259487 +--- !u!1 &998690123982403813 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -438,50 +653,187 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3290891364762899322} - - component: {fileID: 5372547502317683756} - - component: {fileID: 8617115857019184316} - m_Layer: 5 - m_Name: redPoint + - component: {fileID: 6941979466350970428} + - component: {fileID: 877465731949157727} + - component: {fileID: 8143746986761095302} + - component: {fileID: 5320080618400483298} + - component: {fileID: 9137844732760382394} + m_Layer: 0 + m_Name: btnChange m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3290891364762899322 +--- !u!224 &6941979466350970428 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1306023313800259487} + m_GameObject: {fileID: 998690123982403813} 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: 767042923798504073} - m_RootOrder: 0 + m_Father: {fileID: 6961839936357821033} + 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: 103.4, y: 27.4} - m_SizeDelta: {x: 26, y: 26} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 181, y: -43} + m_SizeDelta: {x: 74, y: 74} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5372547502317683756 +--- !u!222 &877465731949157727 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1306023313800259487} + m_GameObject: {fileID: 998690123982403813} m_CullTransparentMesh: 0 ---- !u!114 &8617115857019184316 +--- !u!114 &8143746986761095302 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1306023313800259487} + m_GameObject: {fileID: 998690123982403813} + 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: 1af0be1ab6df5204f8a703a213002f4c, 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 &5320080618400483298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998690123982403813} + 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: 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: 8143746986761095302} + 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 &9137844732760382394 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998690123982403813} + 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 &999429388561363026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691193826889656829} + - component: {fileID: 4236960857669360088} + - component: {fileID: 8443933548419688202} + m_Layer: 0 + m_Name: Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1691193826889656829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999429388561363026} + 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: 1092072551906262308} + 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: -100, y: 0} + m_SizeDelta: {x: 74, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4236960857669360088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999429388561363026} + m_CullTransparentMesh: 0 +--- !u!114 &8443933548419688202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999429388561363026} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -495,7 +847,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Sprite: {fileID: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -504,6 +856,112 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1285194646050053330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8752204126283312607} + - component: {fileID: 2510118871167846868} + - component: {fileID: 2473456623304775665} + - component: {fileID: 2913604621845591879} + - component: {fileID: 5493692961228510797} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8752204126283312607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285194646050053330} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6961839936357821033} + - {fileID: 2501277849694378237} + m_Father: {fileID: 3924427631301158223} + 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: 1080, y: 0} + m_SizeDelta: {x: 1080, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &2510118871167846868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285194646050053330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &2473456623304775665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285194646050053330} + 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!222 &2913604621845591879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285194646050053330} + m_CullTransparentMesh: 0 +--- !u!114 &5493692961228510797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285194646050053330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &1325872924926217028 GameObject: m_ObjectHideFlags: 0 @@ -536,7 +994,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8234046456925150097} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -641,7 +1099,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1580756824808237535 +--- !u!1 &1557888283698067035 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -649,64 +1107,252 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6958119000008345219} - - component: {fileID: 1021951674725684585} - - component: {fileID: 6084430564446873999} + - component: {fileID: 2862046777434801659} + - component: {fileID: 4263336592356831514} + - component: {fileID: 1028675935724071230} m_Layer: 0 - m_Name: Image + m_Name: curAttri m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6958119000008345219 +--- !u!224 &2862046777434801659 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580756824808237535} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1557888283698067035} + 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: 4998258204992831378} + m_Father: {fileID: 5441580854153997261} m_RootOrder: 0 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: -36.4, y: 234.9} - m_SizeDelta: {x: 70, y: 70} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -300, y: 0} + m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1021951674725684585 +--- !u!222 &4263336592356831514 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580756824808237535} + m_GameObject: {fileID: 1557888283698067035} m_CullTransparentMesh: 0 ---- !u!114 &6084430564446873999 +--- !u!114 &1028675935724071230 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580756824808237535} + m_GameObject: {fileID: 1557888283698067035} 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.9529412, g: 0.8509804, b: 0.56078434, 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: 32557b3f6b7c632468013a12809f5f36, type: 3} + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB+29400" + LanguageIndex: 0 +--- !u!1 &1581445801677464303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 12403259772440414} + - component: {fileID: 8240307075293717726} + m_Layer: 0 + m_Name: Pre (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &12403259772440414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581445801677464303} + 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: 6502886690670708912} + - {fileID: 733609824389259095} + - {fileID: 290566521121104297} + m_Father: {fileID: 4546675241244705144} + 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: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8240307075293717726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1581445801677464303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 300 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1721441960854512703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3924427631301158223} + - component: {fileID: 6293267726439917038} + - component: {fileID: 7701834138421013977} + - component: {fileID: 2725411263814276251} + - component: {fileID: 4552846557781784203} + - component: {fileID: 5436953855954864623} + - component: {fileID: 162813398117474625} + m_Layer: 0 + m_Name: attriDetail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3924427631301158223 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8752204126283312607} + m_Father: {fileID: 8234046456925150097} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 306.40002} + m_SizeDelta: {x: 0, y: 1003.6} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &6293267726439917038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7701834138421013977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 0} + 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!222 &2725411263814276251 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_CullTransparentMesh: 0 +--- !u!114 &4552846557781784203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + 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: 0, g: 0, b: 0, a: 0.39215687} + 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 @@ -715,6 +1361,43 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &5436953855954864623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &162813398117474625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721441960854512703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1973450695241023930 GameObject: m_ObjectHideFlags: 0 @@ -869,6 +1552,204 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2554847953600651618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5509983610046846366} + - component: {fileID: 8450589759905280614} + - component: {fileID: 8796153916276633691} + - component: {fileID: 1523850700339393456} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5509983610046846366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554847953600651618} + 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: 7081696985098003445} + 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: 37.7, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8450589759905280614 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554847953600651618} + m_CullTransparentMesh: 0 +--- !u!114 &8796153916276633691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554847953600651618} + 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: 0, b: 0, 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: "\u7EA2\u8272\u5B9D\u7269" + LanguageIndex: 0 +--- !u!114 &1523850700339393456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554847953600651618} + 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: 0 + 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: 8796153916276633691} + 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 &2622613652410906045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2501277849694378237} + - component: {fileID: 7299322731069003781} + - component: {fileID: 5932782642505680742} + m_Layer: 0 + m_Name: Attributions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2501277849694378237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622613652410906045} + 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: 5441580854153997261} + m_Father: {fileID: 8752204126283312607} + 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: 540, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7299322731069003781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622613652410906045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &5932782642505680742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622613652410906045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &2841090068576317079 GameObject: m_ObjectHideFlags: 0 @@ -943,7 +1824,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2965265785178724640 +--- !u!1 &2954590288469488303 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -951,36 +1832,407 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4998258204992831378} + - component: {fileID: 1230246554721197715} + - component: {fileID: 2297110468045696789} + - component: {fileID: 6130011403083844179} + - component: {fileID: 5532838668274130282} m_Layer: 0 - m_Name: tips + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4998258204992831378 +--- !u!224 &1230246554721197715 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2965265785178724640} + m_GameObject: {fileID: 2954590288469488303} + 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: 1092072551906262308} + 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: -100, y: 0} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2297110468045696789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2954590288469488303} + m_CullTransparentMesh: 0 +--- !u!114 &6130011403083844179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2954590288469488303} + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &5532838668274130282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2954590288469488303} + 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: 0 + 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: 6130011403083844179} + 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 &2991080220159804127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5752635875388809247} + - component: {fileID: 2887791726261585121} + - component: {fileID: 4156148608245637905} + - component: {fileID: 2841093646548720350} + m_Layer: 0 + m_Name: curAttri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5752635875388809247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991080220159804127} 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: 6958119000008345219} - - {fileID: 1388934231298380133} - - {fileID: 9214434556114319752} - m_Father: {fileID: 8234046456925150097} - m_RootOrder: 5 + m_Children: [] + m_Father: {fileID: 6961839936357821033} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 959.14996} - m_SizeDelta: {x: 0, y: 1921.7} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -250, y: -117} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2887791726261585121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991080220159804127} + m_CullTransparentMesh: 0 +--- !u!114 &4156148608245637905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991080220159804127} + 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.95294124, g: 0.85098046, b: 0.56078434, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5F53\u524D\u5C5E\u6027" + LanguageIndex: 0 +--- !u!114 &2841093646548720350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991080220159804127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &3226902197055480233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6357862487736937240} + - component: {fileID: 2765882777878608119} + - component: {fileID: 8411614286647960708} + m_Layer: 0 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6357862487736937240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3226902197055480233} + 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: 1534417032179161037} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 75} + m_SizeDelta: {x: 752.6, y: 55.299988} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2765882777878608119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3226902197055480233} + m_CullTransparentMesh: 0 +--- !u!114 &8411614286647960708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3226902197055480233} + 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.58431375, g: 0.6745098, b: 0.7372549, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5347\u7EA7\u540E\u6240\u6709\u795E\u5C06\u7684\u5B9D\u7269\u795E\u5E94\u7B49\u7EA7\u4F1A\u81EA\u52A8\u540C\u6B65" + LanguageIndex: 0 +--- !u!1 &3391191968590256809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5906851928777571115} + - component: {fileID: 6573201118360045003} + - component: {fileID: 6537883573822031207} + - component: {fileID: 2608519575657162330} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5906851928777571115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391191968590256809} + 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: 6191196385319077598} + 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: -100, y: 0} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6573201118360045003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391191968590256809} + m_CullTransparentMesh: 0 +--- !u!114 &6537883573822031207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391191968590256809} + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &2608519575657162330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391191968590256809} + 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: 0 + 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: 6537883573822031207} + 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 &3434884442739188382 GameObject: m_ObjectHideFlags: 0 @@ -1014,11 +2266,13 @@ RectTransform: m_Children: - {fileID: 4194180096112675602} - {fileID: 1123873614442330117} + - {fileID: 3924427631301158223} + - {fileID: 6375773904019016126} + - {fileID: 5046245018554704047} - {fileID: 2626349495467817153} - {fileID: 7587419491667325135} - {fileID: 6031471198377751690} - - {fileID: 4998258204992831378} - - {fileID: 767042923798504073} + - {fileID: 5808598300244136242} - {fileID: 4477932179030371490} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1088,6 +2342,236 @@ MonoBehaviour: m_EditorClassIdentifier: bgList: - {fileID: 2430958493265663198} +--- !u!1 &3624252834012681440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6375773904019016126} + - component: {fileID: 3500001938233357214} + - component: {fileID: 1409075681413742251} + m_Layer: 5 + m_Name: bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6375773904019016126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3624252834012681440} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1534417032179161037} + - {fileID: 5632664662258341743} + m_Father: {fileID: 8234046456925150097} + m_RootOrder: 3 + 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: 0, y: 228.5} + m_SizeDelta: {x: 1080, y: 457} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3500001938233357214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3624252834012681440} + m_CullTransparentMesh: 0 +--- !u!114 &1409075681413742251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3624252834012681440} + 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: 07b843588b4424c47803fcee297520d8, 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 &3641846861506470474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5632664662258341743} + - component: {fileID: 3289272093801977030} + - component: {fileID: 6297646462892343099} + - component: {fileID: 8515162854960258983} + - component: {fileID: 3242121571607293543} + - component: {fileID: 8914343580669220983} + m_Layer: 0 + m_Name: upgradeBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5632664662258341743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + 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: 2423581276645895991} + - {fileID: 4706512428796787486} + m_Father: {fileID: 6375773904019016126} + 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: 6.6, y: -64.599976} + m_SizeDelta: {x: 260, y: 74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3289272093801977030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + m_CullTransparentMesh: 0 +--- !u!114 &6297646462892343099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + 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: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &8515162854960258983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + 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: 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: 6297646462892343099} + 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 &3242121571607293543 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + 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!114 &8914343580669220983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3641846861506470474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8482223f7a300343abc792779f7e094, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] + delegates: [] --- !u!1 &3782720375343926433 GameObject: m_ObjectHideFlags: 0 @@ -1162,7 +2646,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4571675831237362968 +--- !u!1 &4520698042897581994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1170,54 +2654,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 767042923798504073} - - component: {fileID: 1867686796190073246} - - component: {fileID: 4950598286585205788} - - component: {fileID: 5359315147847675992} - - component: {fileID: 1041238254722448395} + - component: {fileID: 1503454463835292959} + - component: {fileID: 6877129186542776157} + - component: {fileID: 56212461145899477} m_Layer: 0 - m_Name: upgradeBtn + m_Name: Select m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &767042923798504073 +--- !u!224 &1503454463835292959 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571675831237362968} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4520698042897581994} + 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: 3290891364762899322} - - {fileID: 4083153808900089139} - m_Father: {fileID: 8234046456925150097} - m_RootOrder: 6 + m_Children: [] + m_Father: {fileID: 6191196385319077598} + m_RootOrder: 1 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: 6.6, y: 163.40002} - m_SizeDelta: {x: 260, y: 74} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -100, y: 0} + m_SizeDelta: {x: 74, y: 62} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1867686796190073246 +--- !u!222 &6877129186542776157 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571675831237362968} + m_GameObject: {fileID: 4520698042897581994} m_CullTransparentMesh: 0 ---- !u!114 &4950598286585205788 +--- !u!114 &56212461145899477 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571675831237362968} + m_GameObject: {fileID: 4520698042897581994} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1225,13 +2705,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1240,13 +2720,153 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &5359315147847675992 +--- !u!1 &4640797250470363370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092072551906262308} + - component: {fileID: 6209275797661237071} + m_Layer: 0 + m_Name: Pre (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1092072551906262308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4640797250470363370} + 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: 1230246554721197715} + - {fileID: 1691193826889656829} + - {fileID: 2233925520947588337} + m_Father: {fileID: 4546675241244705144} + 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: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6209275797661237071 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571675831237362968} + m_GameObject: {fileID: 4640797250470363370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 300 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4716656311157668930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8486956048799115265} + - component: {fileID: 7456745199891535041} + - component: {fileID: 4350917094294417830} + - component: {fileID: 2744153571399756853} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8486956048799115265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716656311157668930} + 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: 1175978126237019005} + 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: 37.7, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7456745199891535041 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716656311157668930} + m_CullTransparentMesh: 0 +--- !u!114 &4350917094294417830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716656311157668930} + 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, g: 1, b: 0, 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: "\u7EA2\u8272\u5B9D\u7269" + LanguageIndex: 0 +--- !u!114 &2744153571399756853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716656311157668930} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1258,7 +2878,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 3 + m_Transition: 0 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} @@ -1276,31 +2896,777 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 4950598286585205788} + m_TargetGraphic: {fileID: 4350917094294417830} 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 &1041238254722448395 -Animator: - serializedVersion: 3 +--- !u!1 &4873955519182416114 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4571675831237362968} + serializedVersion: 6 + m_Component: + - component: {fileID: 5992950636659197194} + - component: {fileID: 4854392655531958087} + - component: {fileID: 250072195347601318} + - component: {fileID: 7370079317538024055} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5992950636659197194 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4873955519182416114} + 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: 1175978126237019005} + 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: -100, y: 0} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4854392655531958087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4873955519182416114} + m_CullTransparentMesh: 0 +--- !u!114 &250072195347601318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4873955519182416114} 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 + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &7370079317538024055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4873955519182416114} + 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: 0 + 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: 250072195347601318} + 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 &4876880070809518629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 290566521121104297} + - component: {fileID: 1248358964599877240} + - component: {fileID: 8903045363723913319} + - component: {fileID: 1823675807082579097} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &290566521121104297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4876880070809518629} + 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: 12403259772440414} + 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: 37.7, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1248358964599877240 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4876880070809518629} + m_CullTransparentMesh: 0 +--- !u!114 &8903045363723913319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4876880070809518629} + 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, g: 0, 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: 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: "\u7EA2\u8272\u5B9D\u7269" + LanguageIndex: 0 +--- !u!114 &1823675807082579097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4876880070809518629} + 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: 0 + 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: 8903045363723913319} + 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 &5701905375914233770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8432852706549568713} + - component: {fileID: 5122330820425761962} + - component: {fileID: 2655736864430418069} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8432852706549568713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5701905375914233770} + 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: 1534417032179161037} + m_RootOrder: 0 + 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: -36.4, y: 234.9} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5122330820425761962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5701905375914233770} + m_CullTransparentMesh: 0 +--- !u!114 &2655736864430418069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5701905375914233770} + 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: 4c2e296e3abdd0d4ab5bc78a365c7a99, 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 &5855011795385272231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5868104094930413599} + - component: {fileID: 3152265541696808544} + - component: {fileID: 2793671843185970730} + m_Layer: 0 + m_Name: nextAttri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5868104094930413599 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5855011795385272231} + 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: 5441580854153997261} + 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: 248, y: 0} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3152265541696808544 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5855011795385272231} + m_CullTransparentMesh: 0 +--- !u!114 &2793671843185970730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5855011795385272231} + 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.9529412, g: 0.8509804, b: 0.56078434, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +1500 + LanguageIndex: 0 +--- !u!1 &6032409819748117618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2233925520947588337} + - component: {fileID: 214805162764423609} + - component: {fileID: 5915966315948091283} + - component: {fileID: 7343634172642595681} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2233925520947588337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032409819748117618} + 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: 1092072551906262308} + 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: 37.7, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &214805162764423609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032409819748117618} + m_CullTransparentMesh: 0 +--- !u!114 &5915966315948091283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032409819748117618} + 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: 0.7909454, b: 0, 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: "\u91D1\u8272\u5B9D\u7269" + LanguageIndex: 0 +--- !u!114 &7343634172642595681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032409819748117618} + 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: 0 + 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: 5915966315948091283} + 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 &6250511103207703318 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4546675241244705144} + - component: {fileID: 4889581754955870189} + - component: {fileID: 4883627346826676147} + - component: {fileID: 2268575129872224842} + - component: {fileID: 6371671546067233890} + - component: {fileID: 2941368694538916998} + m_Layer: 0 + m_Name: selectGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4546675241244705144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + 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: 7081696985098003445} + - {fileID: 1092072551906262308} + - {fileID: 6191196385319077598} + - {fileID: 12403259772440414} + - {fileID: 1175978126237019005} + m_Father: {fileID: 5808598300244136242} + 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: -19, y: -155} + m_SizeDelta: {x: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4889581754955870189 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + m_CullTransparentMesh: 0 +--- !u!114 &4883627346826676147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + 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: 58c503111f310224a9a04ab39a004308, 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!114 &2268575129872224842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 20 + m_Bottom: 30 + m_ChildAlignment: 1 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &6371671546067233890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + 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 &2941368694538916998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250511103207703318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 1.3, y: 1.3, z: 1.3} + initFloat: 0 + isInit: 1 + changeV3: {x: 0.95, y: 0.95, z: 0.95} + changeFloat: 0 + duration: 0.2 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 4546675241244705144} + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 0 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 1 + duration: 0.2 + delay: 0 + curveType: 1 + changeType: 8 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + - initV3: {x: 0.95, y: 0.95, z: 0.95} + initFloat: 0 + isInit: 0 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.1 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 +--- !u!1 &6270637783674064392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5889732860301504761} + - component: {fileID: 2987344881880337471} + - component: {fileID: 2288052374005862459} + m_Layer: 0 + m_Name: jiantou + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5889732860301504761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270637783674064392} + 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: 6961839936357821033} + m_RootOrder: 3 + 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, y: -117} + m_SizeDelta: {x: 70, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2987344881880337471 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270637783674064392} + m_CullTransparentMesh: 0 +--- !u!114 &2288052374005862459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270637783674064392} + 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: fa8416faca1ba5248811c284f9ab9a7c, 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 &6318896378190232131 GameObject: m_ObjectHideFlags: 0 @@ -1381,6 +3747,175 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 8/16 LanguageIndex: 0 +--- !u!1 &6410080023988175308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9018512709446838432} + - component: {fileID: 73896842887418820} + - component: {fileID: 4813074259716305112} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9018512709446838432 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6410080023988175308} + 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: 5046245018554704047} + 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: 130, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &73896842887418820 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6410080023988175308} + m_CullTransparentMesh: 0 +--- !u!114 &4813074259716305112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6410080023988175308} + 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: 2ecaf3be54bafc741b8cbd28c39251f2, 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 &6647517739023165400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5649187950603306812} + - component: {fileID: 8136018549803639713} + - component: {fileID: 6492193541390635704} + - component: {fileID: 4646874134596613410} + m_Layer: 0 + m_Name: nextAttri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5649187950603306812 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647517739023165400} + 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: 6961839936357821033} + m_RootOrder: 4 + 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: 250, y: -117} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8136018549803639713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647517739023165400} + m_CullTransparentMesh: 0 +--- !u!114 &6492193541390635704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647517739023165400} + 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.95294124, g: 0.85098046, b: 0.56078434, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4E0B\u7EA7\u5C5E\u6027" + LanguageIndex: 0 +--- !u!114 &4646874134596613410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647517739023165400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &6686780511225248220 GameObject: m_ObjectHideFlags: 0 @@ -1489,7 +4024,6 @@ RectTransform: - {fileID: 4751131894034482617} - {fileID: 74714527184782466} - {fileID: 7412476955756931709} - - {fileID: 4973733271684115907} - {fileID: 4717349610539232435} m_Father: {fileID: 8234046456925150097} m_RootOrder: 1 @@ -1536,7 +4070,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7693025872837393924 +--- !u!1 &6838132204022284548 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1544,64 +4078,283 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4973733271684115907} - - component: {fileID: 8108426532337337970} - - component: {fileID: 8980434046419351693} + - component: {fileID: 5671689284229169328} + - component: {fileID: 6278832158688902933} + - component: {fileID: 557883001543075045} + - component: {fileID: 7157020523198520367} m_Layer: 0 - m_Name: di + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4973733271684115907 +--- !u!224 &5671689284229169328 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7693025872837393924} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6838132204022284548} + 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: 1123873614442330117} - m_RootOrder: 5 + m_Father: {fileID: 6191196385319077598} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 228.5} - m_SizeDelta: {x: 1080, y: 457} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 37.7, y: 0} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8108426532337337970 +--- !u!222 &6278832158688902933 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7693025872837393924} + m_GameObject: {fileID: 6838132204022284548} m_CullTransparentMesh: 0 ---- !u!114 &8980434046419351693 +--- !u!114 &557883001543075045 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7693025872837393924} + m_GameObject: {fileID: 6838132204022284548} 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: 0.56078434} + m_Color: {r: 1, g: 0, 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: 07b843588b4424c47803fcee297520d8, type: 3} + 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: "\u7D2B\u8272\u5B9D\u7269" + LanguageIndex: 0 +--- !u!114 &7157020523198520367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838132204022284548} + 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: 0 + 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: 557883001543075045} + 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 &6877904206323969994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304468978058557664} + - component: {fileID: 1102424199745917540} + - component: {fileID: 4630240623334457024} + - component: {fileID: 8146517140062107418} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1304468978058557664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877904206323969994} + 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: 6961839936357821033} + 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: -31, y: -43} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1102424199745917540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877904206323969994} + m_CullTransparentMesh: 0 +--- !u!114 &4630240623334457024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877904206323969994} + 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: 0, b: 0, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7EA2\u8272\u5B9D\u7269\u795E\u5E94\u5C5E\u6027" + LanguageIndex: 0 +--- !u!114 &8146517140062107418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877904206323969994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &6902903379598593876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6502886690670708912} + - component: {fileID: 8334165473620573593} + - component: {fileID: 2832404793682848758} + - component: {fileID: 3599979136202326497} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6502886690670708912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6902903379598593876} + 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: 12403259772440414} + 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: -100, y: 0} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8334165473620573593 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6902903379598593876} + m_CullTransparentMesh: 0 +--- !u!114 &2832404793682848758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6902903379598593876} + 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: d1e04308c0a66644a804a2800a96d3a2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1610,7 +4363,49 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7902316799462023939 +--- !u!114 &3599979136202326497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6902903379598593876} + 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: 0 + 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: 2832404793682848758} + 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 &7043505097657033965 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1618,9 +4413,483 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1388934231298380133} - - component: {fileID: 2928422231950059437} - - component: {fileID: 556515533186788038} + - component: {fileID: 5808598300244136242} + - component: {fileID: 7290065259199100094} + - component: {fileID: 2422928800736692520} + - component: {fileID: 753836986559226058} + - component: {fileID: 1508452815388189291} + m_Layer: 0 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5808598300244136242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043505097657033965} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100.375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4546675241244705144} + m_Father: {fileID: 8234046456925150097} + m_RootOrder: 8 + 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!114 &7290065259199100094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043505097657033965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &2422928800736692520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043505097657033965} + m_CullTransparentMesh: 0 +--- !u!114 &753836986559226058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043505097657033965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 +--- !u!114 &1508452815388189291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7043505097657033965} + 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: 753836986559226058} + 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 &7073991889172927795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4548408648486026614} + - component: {fileID: 447227344190852894} + - component: {fileID: 3351637156808858071} + m_Layer: 0 + m_Name: Select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4548408648486026614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073991889172927795} + 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: 7081696985098003445} + 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: -100, y: 0} + m_SizeDelta: {x: 74, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &447227344190852894 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073991889172927795} + m_CullTransparentMesh: 0 +--- !u!114 &3351637156808858071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073991889172927795} + 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: 84b137e960461f44082b1491d6ce5b7b, 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 &7077313715638749341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6961839936357821033} + - component: {fileID: 4219372293152964178} + m_Layer: 0 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6961839936357821033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7077313715638749341} + 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: 1304468978058557664} + - {fileID: 6941979466350970428} + - {fileID: 5752635875388809247} + - {fileID: 5889732860301504761} + - {fileID: 5649187950603306812} + m_Father: {fileID: 8752204126283312607} + 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: 1080, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4219372293152964178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7077313715638749341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 1080 + m_MinHeight: 170 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7374900579942745759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5046245018554704047} + - component: {fileID: 1529059860590659665} + - component: {fileID: 5810638494958289065} + - component: {fileID: 1667760817095344903} + - component: {fileID: 4395980869767514111} + m_Layer: 0 + m_Name: jtBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5046245018554704047 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7374900579942745759} + 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: 9018512709446838432} + m_Father: {fileID: 8234046456925150097} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 75, y: 400} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1529059860590659665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7374900579942745759} + m_CullTransparentMesh: 0 +--- !u!114 &5810638494958289065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7374900579942745759} + 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: 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: 4395980869767514111} + 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 &1667760817095344903 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7374900579942745759} + 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!114 &4395980869767514111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7374900579942745759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 +--- !u!1 &7676803928214395620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4706512428796787486} + - component: {fileID: 589778902875633362} + - component: {fileID: 6331358375870033227} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4706512428796787486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676803928214395620} + 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: 5632664662258341743} + m_RootOrder: 1 + 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 &589778902875633362 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676803928214395620} + m_CullTransparentMesh: 0 +--- !u!114 &6331358375870033227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676803928214395620} + 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.14117648, g: 0.19607845, b: 0.2392157, 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: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 48 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u89E3 \u9501" + LanguageIndex: 0 +--- !u!1 &8344412844583613314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8696281831519106432} + - component: {fileID: 2580530624421692918} + - component: {fileID: 4878232676396176902} m_Layer: 0 m_Name: num m_TagString: Untagged @@ -1628,18 +4897,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1388934231298380133 +--- !u!224 &8696281831519106432 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902316799462023939} + m_GameObject: {fileID: 8344412844583613314} 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: 4998258204992831378} + m_Father: {fileID: 1534417032179161037} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -1647,21 +4916,21 @@ RectTransform: m_AnchoredPosition: {x: 41, y: 234.9} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2928422231950059437 +--- !u!222 &2580530624421692918 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902316799462023939} + m_GameObject: {fileID: 8344412844583613314} m_CullTransparentMesh: 0 ---- !u!114 &556515533186788038 +--- !u!114 &4878232676396176902 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902316799462023939} + m_GameObject: {fileID: 8344412844583613314} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} @@ -1688,7 +4957,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1000 + m_Text: 360 LanguageIndex: 0 --- !u!1 &8444342301981259774 GameObject: @@ -1764,6 +5033,279 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8521545481095866527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6191196385319077598} + - component: {fileID: 280295998097425994} + m_Layer: 0 + m_Name: Pre (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6191196385319077598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8521545481095866527} + 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: 5906851928777571115} + - {fileID: 1503454463835292959} + - {fileID: 5671689284229169328} + m_Father: {fileID: 4546675241244705144} + 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: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &280295998097425994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8521545481095866527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 300 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &8558982242323808038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8002453741240122067} + - component: {fileID: 2916437056746365227} + - component: {fileID: 423077905280576279} + - component: {fileID: 6646896849215344392} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8002453741240122067 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8558982242323808038} + 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: 7081696985098003445} + 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: -100, y: 0} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2916437056746365227 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8558982242323808038} + m_CullTransparentMesh: 0 +--- !u!114 &423077905280576279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8558982242323808038} + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &6646896849215344392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8558982242323808038} + 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: 0 + 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: 423077905280576279} + 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 &8678857989881363656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1534417032179161037} + m_Layer: 0 + m_Name: tips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1534417032179161037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8678857989881363656} + 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: 8432852706549568713} + - {fileID: 8696281831519106432} + - {fileID: 6357862487736937240} + m_Father: {fileID: 6375773904019016126} + m_RootOrder: 0 + 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.000061035156} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8880387722709710650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7081696985098003445} + - component: {fileID: 2583242947482096992} + m_Layer: 0 + m_Name: Pre (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7081696985098003445 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8880387722709710650} + 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: 8002453741240122067} + - {fileID: 4548408648486026614} + - {fileID: 5509983610046846366} + m_Father: {fileID: 4546675241244705144} + 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: 300, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2583242947482096992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8880387722709710650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 300 + m_MinHeight: 50 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8995329282932359638 GameObject: m_ObjectHideFlags: 0 @@ -1838,7 +5380,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &9026415306465658095 +--- !u!1 &9048194639915194198 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1846,78 +5388,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9214434556114319752} - - component: {fileID: 4934578950482669237} - - component: {fileID: 5568363210654820239} - m_Layer: 0 - m_Name: Text (1) + - component: {fileID: 2423581276645895991} + - component: {fileID: 7353685464341558727} + - component: {fileID: 6290178448560296881} + m_Layer: 5 + m_Name: redPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9214434556114319752 + m_IsActive: 0 +--- !u!224 &2423581276645895991 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9026415306465658095} + m_GameObject: {fileID: 9048194639915194198} 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: 4998258204992831378} - m_RootOrder: 2 + m_Father: {fileID: 5632664662258341743} + m_RootOrder: 0 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: 0, y: 75} - m_SizeDelta: {x: 752.6, y: 55.299988} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 103.4, y: 27.4} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4934578950482669237 +--- !u!222 &7353685464341558727 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9026415306465658095} + m_GameObject: {fileID: 9048194639915194198} m_CullTransparentMesh: 0 ---- !u!114 &5568363210654820239 +--- !u!114 &6290178448560296881 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9026415306465658095} + m_GameObject: {fileID: 9048194639915194198} 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.58431375, g: 0.6745098, b: 0.7372549, a: 1} - m_RaycastTarget: 1 + 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5347\u7EA7\u540E\u6240\u6709\u795E\u5C06\u7684\u5B9D\u7269\u795E\u5E94\u7B49\u7EA7\u4F1A\u81EA\u52A8\u540C\u6B65" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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!1001 &530045644920943086 PrefabInstance: m_ObjectHideFlags: 0 @@ -1968,7 +5504,7 @@ PrefabInstance: - target: {fileID: 4143265631625813324, guid: 42e534317a0ca784ab950294a7230bad, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4143265631625813324, guid: 42e534317a0ca784ab950294a7230bad, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index 7bbc48dd0e..b1ee321454 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -3,6 +3,8 @@ local this = SacredTreeManager local treeLevelConfig = ConfigManager.GetConfig(ConfigName.GodHoodTreeLevel) local treeSetting = ConfigManager.GetConfig(ConfigName.GodHoodTreeSetting) local jewerLevelUpConfig = ConfigManager.GetConfig(ConfigName.JewelRankupConfig) +local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) +local ClientAttriData = ConfigManager.GetConfigData(ConfigName.GodHoodTreeSetting,0).PropertyUnlcokLevelForClient function this.Initialize() this.treeLevel = 0 @@ -145,4 +147,39 @@ function this.CheckRedPoint() end end +--获取当前等级和下一级的数据 +function this.GetAttriDetail(index) + local data = {} + local maxSacredLevel = ConfigManager.GetConfigDataByKey(ConfigName.JewelConfig,"GodHoodPool",index).GodHoodMaxlv + local level = this.treeLevel < maxSacredLevel and this.treeLevel or maxSacredLevel + local configData = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",3,"Level",level,"PoolID",index) + local configNextData = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",3,"Level",level+1,"PoolID",index) + if this.treeLevel >= maxSacredLevel then--如果当前神树等级超出魂灵宝所能达到的最大等级就取最大 + configNextData = nil + end + -- LogRed("#configData.Property:"..tostring(#configData.Property)) + for i = 1, #configData.Property do + data[i] = {} + local bool = MonsterCampManager.GetFourElementTotalWave() >= ClientAttriData[i][2] + local color1 = bool and "#F3D98F" or "#A0A0A0"--是否解锁了当前属性 + local color2 = bool and "#00FF00" or "#A0A0A0"--是否解锁了当前属性 + if PropertyConfig[configData.Property[i][1]].Style == 1 then + data[i].text1 = string.format("%s+%s",color1,PropertyConfig[configData.Property[i][1]].Info,configData.Property[i][2]) + elseif PropertyConfig[configData.Property[i][1]].Style == 2 then + data[i].text1 = string.format("%s+%s",color1,PropertyConfig[configData.Property[i][1]].Info,configData.Property[i][2]/100).."%" + end + -- LogPink("configNextData:"..tostring(configNextData)) + if configNextData then + if PropertyConfig[configNextData.Property[i][1]].Style == 1 then + data[i].text2 = string.format("+%s",color2,configNextData.Property[i][2]) + elseif PropertyConfig[configNextData.Property[i][1]].Style == 2 then + data[i].text2 = string.format("+%s",color2,configNextData.Property[i][2]/100).."%" + end + else + data[i].text2 = "已达上限" + end + -- LogGreen(data[i].text1.." "..data[i].text2) + end + return data +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index e0fe1d423d..ee75e7a636 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -8,6 +8,24 @@ local orginLayer = 0 local curTreeLevel = 0 local length = 0 local t = 3 --用来区分长按和点击的临界值 +local lastSelect = 5 + + +local COLOR = { + [1] = "#00FF00", + [2] = "#0000FF", + [3] = "#FF00FF", + [4] = "#FFCA00", + [5] = "#FF0000", +} +local Trans = { + [1] = 5, + [2] = 4, + [3] = 3, + [4] = 2, + [5] = 1, +} + function SacredTreePanel:InitComponent() self.spLoader = SpriteLoader.New() --button @@ -16,18 +34,44 @@ function SacredTreePanel:InitComponent() self.helpBtn = Util.GetGameObject(self.transform, "helpBtn") self.helpPos = self.helpBtn:GetComponent("RectTransform").localPosition self.attriBtn = Util.GetGameObject(self.transform, "attriBtn") - self.upgradeBtn = Util.GetGameObject(self.transform, "upgradeBtn") - self.treeRed = Util.GetGameObject(self.transform, "upgradeBtn/redPoint") - - --show + self.attriNum = Util.GetGameObject(self.attriBtn, "num"):GetComponent("Text") self.treeLevel = Util.GetGameObject(self.transform, "bg/level"):GetComponent("Text") - self.needIcon = Util.GetGameObject(self.transform, "tips/Image"):GetComponent("Image") - self.needNum = Util.GetGameObject(self.transform, "tips/num"):GetComponent("Text") - self.upGrade = Util.GetGameObject(self.transform, "upgradeBtn/Text"):GetComponent("Text") - self.attriNum = Util.GetGameObject(self.transform, "attriBtn/num"):GetComponent("Text") + --btn + self.bottom = Util.GetGameObject(self.transform, "bottom") + self.upgradeBtn = Util.GetGameObject(self.bottom, "upgradeBtn") + self.treeRed = Util.GetGameObject(self.upgradeBtn, "redPoint") + self.upGrade = Util.GetGameObject(self.upgradeBtn, "Text"):GetComponent("Text") + + --tips + self.tips = Util.GetGameObject(self.bottom, "tips") + self.needIcon = Util.GetGameObject(self.tips, "Image"):GetComponent("Image") + self.needNum = Util.GetGameObject(self.tips, "num"):GetComponent("Text") + + --详细信息部分 + self.attriDetail = Util.GetGameObject(self.transform, "attriDetail") + self.title = Util.GetGameObject(self.attriDetail, "Grid/Top/Title"):GetComponent("Text") + self.btnChange = Util.GetGameObject(self.attriDetail, "Grid/Top/btnChange") + self.attriGrid = Util.GetGameObject(self.attriDetail, "Grid/Attributions") + self.attriPre = Util.GetGameObject(self.attriGrid, "attriPre") + self.jtBtn = Util.GetGameObject(self.transform, "jtBtn") + self.jtImg = Util.GetGameObject(self.jtBtn, "Image") + self.attriList = {} + self.bool = true--箭头按钮 + self.selectIndex = 5 + self.selectMask = Util.GetGameObject(self.transform, "Mask") + self.selectGrid = Util.GetGameObject(self.selectMask, "selectGrid") + self.selectList = {} + for i = 1, 5 do + self.selectList[i] = {} + self.selectList[i].btn1 = Util.GetGameObject(self.selectMask, "selectGrid/Pre ("..i..")/Image") + self.selectList[i].btn2 = Util.GetGameObject(self.selectMask, "selectGrid/Pre ("..i..")/Text") + self.selectList[i].select = Util.GetGameObject(self.selectMask, "selectGrid/Pre ("..i..")/Select") + self.selectList[i].select:SetActive(false) + end + + --特效加长按 self.UI_effect_RecruitPanel_particle = Util.GetGameObject(self.transform, "UI_effect_RecruitPanel_particle") - self.trigger = Util.GetEventTriggerListener(self.upgradeBtn) self.OnPointerDo = function(go, data) self:OnPointerDown1(go, data) @@ -93,20 +137,19 @@ function SacredTreePanel:Refresh(isSend) end -- 重新计算宝物评分 EquipTreasureManager.SetAllTreasureDirty() - SacredTreeManager.OnPowerChange(oldPower) end self.isShortPress = false self.numCount = 0 - self:RequestDonate(self.num) + self:RequestDonate(self.num) else self.num = self.num + 1 - BagManager.HeroLvUpUpdateItemsNum(treeLevelConfig[curTreeLevel].LvupCost[1],treeLevelConfig[curTreeLevel].LvupCost[2]) + BagManager.HeroLvUpUpdateItemsNum(treeLevelConfig[curTreeLevel].LvupCost[1],treeLevelConfig[curTreeLevel].LvupCost[2]) self.itemNum = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) if curTreeLevel == 0 then PopupTipPanel.ShowTip("成功解锁神树~") end - SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 + SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 curTreeLevel = curTreeLevel + 1 local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) EquipTreasureManager.ChangeTreeLv() @@ -128,14 +171,13 @@ function SacredTreePanel:Refresh(isSend) self.isPressed = false self:Refresh(true) return - end - + end end end function SacredTreePanel:RequestDonate(num) - NetManager.UpgradeGodTreeRequest(num,function () - self.num = 0 + NetManager.UpgradeGodTreeRequest(num,function () + self.num = 0 self:OnShow() end) end @@ -150,25 +192,47 @@ function SacredTreePanel:BindEvent() Util.AddClick(self.attriBtn, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenYingShuXing) end) - -- Util.AddClick(self.upgradeBtn, function() - -- if curTreeLevel >= length then - -- PopupTipPanel.ShowTip("神树已达最大等级~") - -- else - -- local num = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) - -- if num < treeLevelConfig[curTreeLevel].LvupCost[2] then - -- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) - -- else - -- local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) - -- NetManager.UpgradeGodTreeRequest(function () - -- if curTreeLevel == 0 then - -- PopupTipPanel.ShowTip("成功解锁神树~") - -- end - -- SacredTreeManager.OnPowerChange(oldPower) - -- SacredTreePanel:OnShow() - -- end) - -- end - -- end - -- end) + Util.AddClick(self.jtBtn, function() + self.bool = not self.bool + self:ResetDetailPos() + end) + + Util.AddClick(self.btnChange, function() + local length = self.bool and SacredTreeManager.CulAttri()*50 - 700 or #attriConfig.PropertyUnlcokLevels*50 - 700 + self.selectGrid:GetComponent("RectTransform").localPosition = Vector3.New(0,length,0) + self.selectMask:SetActive(true) + PlayUIAnim(self.selectGrid) + end) + for i = 1, 5 do + Util.AddClick(self.selectList[i].btn1, function() + for j = 1, 5 do + self.selectList[j].select:SetActive(false) + end + self.selectList[i].select:SetActive(true) + self.selectIndex = Trans[i] + end) + Util.AddClick(self.selectList[i].btn2, function() + for j = 1, 5 do + self.selectList[j].select:SetActive(false) + end + self.selectList[i].select:SetActive(true) + self.selectIndex = Trans[i] + end) + end + Util.AddClick(self.selectMask, function() + self.selectMask:SetActive(false) + if lastSelect == self.selectIndex then + return + end + lastSelect = self.selectIndex + for index, value in ipairs(self.attriList) do + value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () + -- value.transform.rotation=Vector3.New(-90,0,0) + self:SetAttriDetail() + end) + end + end) + BindRedPointObject(RedPointType.Sacred,self.treeRed) FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册 end @@ -227,6 +291,49 @@ function SacredTreePanel:OnShow() self.needNum.gameObject:SetActive(curTreeLevel < length) end self.attriNum.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels + --设置中间属性 + self:SetAttriDetail() +end + + +function SacredTreePanel:SetAttriDetail() + local curSelectIndex = self.selectIndex + if curTreeLevel <= 0 then + self.attriDetail:SetActive(false) + else + self.attriDetail:SetActive(true) + self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) + local data = SacredTreeManager.GetAttriDetail(curSelectIndex) + for index, value in ipairs(data) do + local go = self.attriList[index] + if not go then + go = newObjToParent(self.attriPre,self.attriGrid.transform) + self.attriList[index] = go + go:SetActive(true) + end + PlayUIAnim(go) + Util.GetGameObject(go,"curAttri"):GetComponent("Text").text = value.text1 + Util.GetGameObject(go,"nextAttri"):GetComponent("Text").text = value.text2 + end + self:InitDetailPos() + end +end + +function SacredTreePanel:InitDetailPos() + self.selectMask:SetActive(false) + self.selectList[Trans[self.selectIndex]].select:SetActive(true) + local rotation = self.bool and Vector3.zero or Vector3.New(179,0,0) + local length = self.bool and 170 + SacredTreeManager.CulAttri()*50 or 170 + #attriConfig.PropertyUnlcokLevels*50 + self.jtImg:GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) + self.attriDetail:GetComponent("RectTransform").sizeDelta = Vector3(0,length,0) +end + +function SacredTreePanel:ResetDetailPos() + local length = self.bool and 170 + SacredTreeManager.CulAttri()*50 or 170 + #attriConfig.PropertyUnlcokLevels*50 + local size = Vector2.New(1080,length) + local rotation = self.bool and 0 or 179 + self.attriDetail.transform:DOSizeDelta(size, 0.8) + self.jtImg.transform:DORotateQuaternion(Quaternion.Euler(Vector3.New(rotation,0,0)),0.8) end function SacredTreePanel:OnClose() @@ -234,10 +341,12 @@ function SacredTreePanel:OnClose() -- body end function SacredTreePanel:OnDestroy() + self.selectIndex = 5 + self.attriList = {} FixedUpdateBeat:Remove(self.OnUpdate, self) SubUIManager.Close(self.UpView) self.spLoader:Destroy() - ClearRedPointObject(RedPointType.Sacred,self.treeRed) + ClearRedPointObject(RedPointType.Sacred,self.treeRed) end return SacredTreePanel \ No newline at end of file From 314cc59bbc0e32a5be72f9d988a24ed6391c34a1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 7 Jan 2022 19:39:58 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/SacredTree/SacredTreePanel.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index ee75e7a636..8527fa5c9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -58,6 +58,7 @@ function SacredTreePanel:InitComponent() self.jtImg = Util.GetGameObject(self.jtBtn, "Image") self.attriList = {} self.bool = true--箭头按钮 + self.playAni = false--箭头按钮 self.selectIndex = 5 self.selectMask = Util.GetGameObject(self.transform, "Mask") self.selectGrid = Util.GetGameObject(self.selectMask, "selectGrid") @@ -227,7 +228,7 @@ function SacredTreePanel:BindEvent() lastSelect = self.selectIndex for index, value in ipairs(self.attriList) do value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () - -- value.transform.rotation=Vector3.New(-90,0,0) + self.playAni = true self:SetAttriDetail() end) end @@ -257,6 +258,7 @@ function SacredTreePanel:OnOpen() end function SacredTreePanel:OnShow() Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) + self.playAni = false CheckRedPointStatus(RedPointType.Sacred) self.treeRed:SetActive(SacredTreeManager.CheckRedPoint()) curTreeLevel = SacredTreeManager.treeLevel @@ -311,7 +313,11 @@ function SacredTreePanel:SetAttriDetail() self.attriList[index] = go go:SetActive(true) end - PlayUIAnim(go) + if self.playAni then + PlayUIAnim(go) + else + go.transform.rotation=Vector3.New(0,0,0) + end Util.GetGameObject(go,"curAttri"):GetComponent("Text").text = value.text1 Util.GetGameObject(go,"nextAttri"):GetComponent("Text").text = value.text2 end From 94cf5e4aec71b2ac3647235fb6357b9249f2d95f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 8 Jan 2022 10:33:31 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/SacredTree/SacredTreePanel.prefab | 2 +- .../~Lua/Modules/Popup/TrialRewardPopup.lua | 5 +++++ .../Modules/SacredTree/SacredTreeManager.lua | 4 ++-- .../Modules/SacredTree/SacredTreePanel.lua | 19 +++++++++++++++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab index dc4155cbaf..93f02d49d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab @@ -3774,7 +3774,7 @@ RectTransform: m_GameObject: {fileID: 6410080023988175308} 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_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: [] m_Father: {fileID: 5046245018554704047} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 9e81b97ff8..8df8f1113a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -14,6 +14,7 @@ function TrialRewardPopup:InitComponent() this.panel=Util.GetGameObject(this.gameObject,"Panel") this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.maskBtn=Util.GetGameObject(this.gameObject,"Mask") + this.title = Util.GetGameObject(this.panel,"Title"):GetComponent("Text") this.scroll=Util.GetGameObject(this.panel,"Scroll") pres[1]=Util.GetGameObject(this.panel,"Scroll/Pre") @@ -97,6 +98,10 @@ function this.RefreshPanel(isTop,isAni) end,not isTop,not isAni) end + this.title.text = "奖 励" + if curType == 5 then + this.title.text = "任 务" + end end --设置每条数据 diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index b1ee321454..5dd1b48aac 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -171,9 +171,9 @@ function this.GetAttriDetail(index) -- LogPink("configNextData:"..tostring(configNextData)) if configNextData then if PropertyConfig[configNextData.Property[i][1]].Style == 1 then - data[i].text2 = string.format("+%s",color2,configNextData.Property[i][2]) + data[i].text2 = string.format("+%s",color2,configNextData.Property[i][2] - configData.Property[i][2]) elseif PropertyConfig[configNextData.Property[i][1]].Style == 2 then - data[i].text2 = string.format("+%s",color2,configNextData.Property[i][2]/100).."%" + data[i].text2 = string.format("+%s",color2,(configNextData.Property[i][2] - configData.Property[i][2])/100).."%" end else data[i].text2 = "已达上限" diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index 8527fa5c9a..81e29305b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -59,7 +59,6 @@ function SacredTreePanel:InitComponent() self.attriList = {} self.bool = true--箭头按钮 self.playAni = false--箭头按钮 - self.selectIndex = 5 self.selectMask = Util.GetGameObject(self.transform, "Mask") self.selectGrid = Util.GetGameObject(self.selectMask, "selectGrid") self.selectList = {} @@ -200,6 +199,9 @@ function SacredTreePanel:BindEvent() Util.AddClick(self.btnChange, function() local length = self.bool and SacredTreeManager.CulAttri()*50 - 700 or #attriConfig.PropertyUnlcokLevels*50 - 700 + if SacredTreeManager.CulAttri() == 0 then + length = #attriConfig.PropertyUnlcokLevels*50 - 700 + end self.selectGrid:GetComponent("RectTransform").localPosition = Vector3.New(0,length,0) self.selectMask:SetActive(true) PlayUIAnim(self.selectGrid) @@ -211,6 +213,7 @@ function SacredTreePanel:BindEvent() end self.selectList[i].select:SetActive(true) self.selectIndex = Trans[i] + PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) end) Util.AddClick(self.selectList[i].btn2, function() for j = 1, 5 do @@ -218,6 +221,7 @@ function SacredTreePanel:BindEvent() end self.selectList[i].select:SetActive(true) self.selectIndex = Trans[i] + PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) end) end Util.AddClick(self.selectMask, function() @@ -255,6 +259,11 @@ end function SacredTreePanel:OnOpen() self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.SacredTree}) + LogRed("Uid:"..tostring(PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect"))) + if PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect") == 0 then + PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",5) + end + self.selectIndex = PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect") end function SacredTreePanel:OnShow() Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) @@ -302,8 +311,12 @@ function SacredTreePanel:SetAttriDetail() local curSelectIndex = self.selectIndex if curTreeLevel <= 0 then self.attriDetail:SetActive(false) + self.selectMask:SetActive(false) + self.jtBtn:SetActive(false) else self.attriDetail:SetActive(true) + self.selectMask:SetActive(true) + self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0) self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) local data = SacredTreeManager.GetAttriDetail(curSelectIndex) for index, value in ipairs(data) do @@ -330,6 +343,9 @@ function SacredTreePanel:InitDetailPos() self.selectList[Trans[self.selectIndex]].select:SetActive(true) local rotation = self.bool and Vector3.zero or Vector3.New(179,0,0) local length = self.bool and 170 + SacredTreeManager.CulAttri()*50 or 170 + #attriConfig.PropertyUnlcokLevels*50 + if SacredTreeManager.CulAttri() == 0 then + length = 170 + #attriConfig.PropertyUnlcokLevels*50 + end self.jtImg:GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) self.attriDetail:GetComponent("RectTransform").sizeDelta = Vector3(0,length,0) end @@ -347,7 +363,6 @@ function SacredTreePanel:OnClose() -- body end function SacredTreePanel:OnDestroy() - self.selectIndex = 5 self.attriList = {} FixedUpdateBeat:Remove(self.OnUpdate, self) SubUIManager.Close(self.UpView) From e4a5f213e866251933a1343233ebfa31a6ee8dc9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 8 Jan 2022 11:17:26 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/SacredTree/SacredTreePanel.prefab | 99 ++++++++++++++++--- .../Modules/SacredTree/SacredTreeManager.lua | 3 +- .../Modules/SacredTree/SacredTreePanel.lua | 52 +++++++--- 3 files changed, 126 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab index 93f02d49d3..273da6be2f 100644 --- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab @@ -677,7 +677,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6961839936357821033} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1611,7 +1611,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0.7764706, g: 0.3882353, b: 0.4, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1972,7 +1972,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6961839936357821033} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2838,7 +2838,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 1, b: 0, a: 1} + m_Color: {r: 0.32156864, g: 0.5921569, b: 0.39215687, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2858,7 +2858,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7EA2\u8272\u5B9D\u7269" + m_Text: "\u7EFF\u8272\u5B9D\u7269" LanguageIndex: 0 --- !u!114 &2744153571399756853 MonoBehaviour: @@ -3078,7 +3078,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 1, a: 1} + m_Color: {r: 0.3882353, g: 0.59607846, b: 0.7882353, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3098,7 +3098,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7EA2\u8272\u5B9D\u7269" + m_Text: "\u84DD\u8272\u5B9D\u7269" LanguageIndex: 0 --- !u!114 &1823675807082579097 MonoBehaviour: @@ -3355,7 +3355,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7909454, b: 0, a: 1} + m_Color: {r: 0.9882353, g: 0.69803923, b: 0.30588236, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3623,7 +3623,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6961839936357821033} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3852,7 +3852,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6961839936357821033} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4129,7 +4129,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 1, a: 1} + m_Color: {r: 0.5764706, g: 0.34509805, b: 0.7411765, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4224,7 +4224,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6961839936357821033} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4405,6 +4405,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6960769041461934166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2853275196061139364} + - component: {fileID: 5145713726631211692} + - component: {fileID: 7365814524658874698} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2853275196061139364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960769041461934166} + 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: 6961839936357821033} + 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: -31, y: -43} + m_SizeDelta: {x: 400, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5145713726631211692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960769041461934166} + m_CullTransparentMesh: 0 +--- !u!114 &7365814524658874698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960769041461934166} + 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 &7043505097657033965 GameObject: m_ObjectHideFlags: 0 @@ -4637,6 +4711,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2853275196061139364} - {fileID: 1304468978058557664} - {fileID: 6941979466350970428} - {fileID: 5752635875388809247} diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index 5dd1b48aac..be66ac0d73 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -176,7 +176,8 @@ function this.GetAttriDetail(index) data[i].text2 = string.format("+%s",color2,(configNextData.Property[i][2] - configData.Property[i][2])/100).."%" end else - data[i].text2 = "已达上限" + local color = this.treeLevel >= maxSacredLevel and "A0A0A0" or "F3D98F" + data[i].text2 = string.format("已达上限",color) end -- LogGreen(data[i].text1.." "..data[i].text2) end diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index 81e29305b9..c3ea19ddbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -208,35 +208,57 @@ function SacredTreePanel:BindEvent() end) for i = 1, 5 do Util.AddClick(self.selectList[i].btn1, function() + if lastSelect == self.selectIndex then + return + end for j = 1, 5 do self.selectList[j].select:SetActive(false) end self.selectList[i].select:SetActive(true) self.selectIndex = Trans[i] PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) + self.selectMask:SetActive(false) + lastSelect = self.selectIndex + for index, value in ipairs(self.attriList) do + value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () + self.playAni = true + self:SetAttriDetail() + end) + end end) Util.AddClick(self.selectList[i].btn2, function() + if lastSelect == self.selectIndex then + return + end for j = 1, 5 do self.selectList[j].select:SetActive(false) end self.selectList[i].select:SetActive(true) self.selectIndex = Trans[i] PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) + self.selectMask:SetActive(false) + lastSelect = self.selectIndex + for index, value in ipairs(self.attriList) do + value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () + self.playAni = true + self:SetAttriDetail() + end) + end end) end - Util.AddClick(self.selectMask, function() - self.selectMask:SetActive(false) - if lastSelect == self.selectIndex then - return - end - lastSelect = self.selectIndex - for index, value in ipairs(self.attriList) do - value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () - self.playAni = true - self:SetAttriDetail() - end) - end - end) + -- Util.AddClick(self.selectMask, function() + -- self.selectMask:SetActive(false) + -- if lastSelect == self.selectIndex then + -- return + -- end + -- lastSelect = self.selectIndex + -- for index, value in ipairs(self.attriList) do + -- value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () + -- self.playAni = true + -- self:SetAttriDetail() + -- end) + -- end + -- end) BindRedPointObject(RedPointType.Sacred,self.treeRed) FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册 @@ -259,7 +281,6 @@ end function SacredTreePanel:OnOpen() self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.SacredTree}) - LogRed("Uid:"..tostring(PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect"))) if PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect") == 0 then PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",5) end @@ -317,7 +338,8 @@ function SacredTreePanel:SetAttriDetail() self.attriDetail:SetActive(true) self.selectMask:SetActive(true) self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0) - self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) + self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性") + -- self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) local data = SacredTreeManager.GetAttriDetail(curSelectIndex) for index, value in ipairs(data) do local go = self.attriList[index] From c157985e244f2e73de33c8098b161ed6748c5f9a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 8 Jan 2022 11:36:31 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/HomeLand/HomeLandPanel.prefab | 6 ++-- .../UI/SacredTree/SacredTreePanel.prefab | 2 +- ...eneralInfoPopup_HomeLandBuildingDetail.lua | 2 +- .../~Lua/Modules/HomeLand/HomeLandManager.lua | 6 ++-- .../Modules/SacredTree/SacredTreePanel.lua | 33 +++++-------------- 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab index 11fb7a9343..ec2f4124e8 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab @@ -3830,7 +3830,7 @@ RectTransform: - {fileID: 4322729524025985070} - {fileID: 3371266415083751348} m_Father: {fileID: 4324122628603852573} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8165,8 +8165,8 @@ RectTransform: - {fileID: 3157917383277554550} - {fileID: 5998833855639941095} - {fileID: 8624922088146301509} - - {fileID: 8801044181696536146} - {fileID: 7047674656314394960} + - {fileID: 8801044181696536146} m_Father: {fileID: 2688485128400521159} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15634,7 +15634,7 @@ RectTransform: m_Children: - {fileID: 8467694386051670500} m_Father: {fileID: 4324122628603852573} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab index 273da6be2f..daa739e8f5 100644 --- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab @@ -1611,7 +1611,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7764706, g: 0.3882353, b: 0.4, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandBuildingDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandBuildingDetail.lua index 02a67635c9..7d3b621806 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandBuildingDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandBuildingDetail.lua @@ -60,7 +60,7 @@ function this:OnShow(_parent,_args) this.limitNum.text = data.dataSingle.Storage[1][2] local v = ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,4022).Condition[1][2]/10000-1 local priValue = HomeLandManager.activePrivilege and string.format("+%s",math.ceil(data.dataSingle.Gain[2]*v)) or "" - this.harvestNum.text = string.format("%s %s/每分钟",data.dataSingle.Gain[2],priValue) + this.harvestNum.text = string.format("%s %s/分钟",data.dataSingle.Gain[2],priValue) this.harvestIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Gain[1])) end diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua index 2bd3dfc6e1..cdaf3f0861 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua @@ -138,8 +138,10 @@ end function this.GetCurIndex() for i = 1, 4 do if this.EquipData[i].configData.Limit2 == EquipRankUp[this.levelProId].Level then - this.curEquip = i - return + if this.EquipData[i].configData.Cost and this.EquipData[i].configData.Cost[1][2] <= BagManager.GetTotalItemNum(this.EquipData[i].configData.Cost[1][1]) then + this.curEquip = i + return + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index c3ea19ddbd..14bce46a10 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -8,14 +8,12 @@ local orginLayer = 0 local curTreeLevel = 0 local length = 0 local t = 3 --用来区分长按和点击的临界值 -local lastSelect = 5 - local COLOR = { - [1] = "#00FF00", - [2] = "#0000FF", - [3] = "#FF00FF", - [4] = "#FFCA00", + [1] = "#529764FF", + [2] = "#6398c9FF", + [3] = "#9358bdFF", + [4] = "#fcb24eFF", [5] = "#FF0000", } local Trans = { @@ -208,7 +206,7 @@ function SacredTreePanel:BindEvent() end) for i = 1, 5 do Util.AddClick(self.selectList[i].btn1, function() - if lastSelect == self.selectIndex then + if i == self.selectIndex then return end for j = 1, 5 do @@ -218,7 +216,6 @@ function SacredTreePanel:BindEvent() self.selectIndex = Trans[i] PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) self.selectMask:SetActive(false) - lastSelect = self.selectIndex for index, value in ipairs(self.attriList) do value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () self.playAni = true @@ -227,7 +224,7 @@ function SacredTreePanel:BindEvent() end end) Util.AddClick(self.selectList[i].btn2, function() - if lastSelect == self.selectIndex then + if i == self.selectIndex then return end for j = 1, 5 do @@ -237,7 +234,6 @@ function SacredTreePanel:BindEvent() self.selectIndex = Trans[i] PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i]) self.selectMask:SetActive(false) - lastSelect = self.selectIndex for index, value in ipairs(self.attriList) do value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () self.playAni = true @@ -246,19 +242,6 @@ function SacredTreePanel:BindEvent() end end) end - -- Util.AddClick(self.selectMask, function() - -- self.selectMask:SetActive(false) - -- if lastSelect == self.selectIndex then - -- return - -- end - -- lastSelect = self.selectIndex - -- for index, value in ipairs(self.attriList) do - -- value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () - -- self.playAni = true - -- self:SetAttriDetail() - -- end) - -- end - -- end) BindRedPointObject(RedPointType.Sacred,self.treeRed) FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册 @@ -338,8 +321,8 @@ function SacredTreePanel:SetAttriDetail() self.attriDetail:SetActive(true) self.selectMask:SetActive(true) self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0) - self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性") - -- self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) + -- self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性") + self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) local data = SacredTreeManager.GetAttriDetail(curSelectIndex) for index, value in ipairs(data) do local go = self.attriList[index] From 9098900dc76b3d992b996044941f6dd53355818c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 8 Jan 2022 11:54:31 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/SacredTree/SacredTreeManager.lua | 2 +- .../Modules/SacredTree/SacredTreePanel.lua | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index be66ac0d73..5096ec9d05 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -176,7 +176,7 @@ function this.GetAttriDetail(index) data[i].text2 = string.format("+%s",color2,(configNextData.Property[i][2] - configData.Property[i][2])/100).."%" end else - local color = this.treeLevel >= maxSacredLevel and "A0A0A0" or "F3D98F" + local color = not bool and "A0A0A0" or "F3D98F" data[i].text2 = string.format("已达上限",color) end -- LogGreen(data[i].text1.." "..data[i].text2) diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index 14bce46a10..4d1846d2b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -206,7 +206,8 @@ function SacredTreePanel:BindEvent() end) for i = 1, 5 do Util.AddClick(self.selectList[i].btn1, function() - if i == self.selectIndex then + -- LogRed(self.selectIndex.." "..i) + if Trans[i] == self.selectIndex then return end for j = 1, 5 do @@ -224,7 +225,8 @@ function SacredTreePanel:BindEvent() end end) Util.AddClick(self.selectList[i].btn2, function() - if i == self.selectIndex then + -- LogRed(self.selectIndex.." "..i) + if Trans[i] == self.selectIndex then return end for j = 1, 5 do @@ -242,6 +244,18 @@ function SacredTreePanel:BindEvent() end end) end + Util.AddClick(self.selectMask, function() + self.selectMask:SetActive(false) + if PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect") == self.selectIndex then + return + end + for index, value in ipairs(self.attriList) do + value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function () + self.playAni = true + self:SetAttriDetail() + end) + end + end) BindRedPointObject(RedPointType.Sacred,self.treeRed) FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册 From 129250110f84d9afc7553cda30e5fa95312f6942 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 8 Jan 2022 14:22:30 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E?= =?UTF-8?q?=E6=A0=91=E3=80=91=E6=BB=A1=E7=BA=A7=E5=8F=96=E6=B6=88=E7=AE=AD?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/SacredTree/SacredTreePanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index 4d1846d2b0..f5a74d367f 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -334,7 +334,7 @@ function SacredTreePanel:SetAttriDetail() else self.attriDetail:SetActive(true) self.selectMask:SetActive(true) - self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0) + self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0 and SacredTreeManager.CulAttri() < #attriConfig.PropertyUnlcokLevels ) -- self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性") self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1]) local data = SacredTreeManager.GetAttriDetail(curSelectIndex) From a4bd6fb4411f73742fe90ff228e64d52fb79633e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 14:23:44 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=90=E6=97=A5=E5=B8=B8=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E5=AF=BC=E8=87=B4=E6=88=90?= =?UTF-8?q?=E5=B0=B1=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Mission/MissionDailyPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 3db63668d3..ad8994d8af 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -84414,7 +84414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3419202398703480616 RectTransform: m_ObjectHideFlags: 0 From e12ddf56c684844db047ce694a0ae8d34b834bd7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 14:50:34 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E4=BF=AE=E5=A4=8D=E5=91=BC=E5=90=B8=E9=97=AA?= =?UTF-8?q?=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/FightLevelFormation.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua index ffaaaeed5b..d2c8e916c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua @@ -359,8 +359,8 @@ function this.HeroItemAdapter(_go, _heroData) local con = _showConfig[loopList[index]] if con then txt.text = con.text - txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0) - highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0) + txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5) + highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5) end end) -- loopFadeText(txt, highlight:GetComponent("Image"), loopList, 0) From 0a4c24520c6fb4ff99e48b886a5eaa54a026dbf2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 15:03:06 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E7=BA=A2=E5=8F=89=E8=B5=84=E6=BA=90=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormationAtlas/r_tongyong_chacha.png | Bin 0 -> 2183 bytes .../FormationAtlas/r_tongyong_chacha.png.meta | 99 ++++++++++++++++++ .../UI/Formation/FormationPanelV2.prefab | 12 +-- 3 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png create mode 100644 Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta diff --git a/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png new file mode 100644 index 0000000000000000000000000000000000000000..242460f66c3aa5850eb1a593d9efc2f6c8db99a0 GIT binary patch literal 2183 zcmV;22zd92P)Vfio-0_y4(K>e9ei|P7F(+p9TY_!s$dJWw%92} zUUmjbJ4_p^Vw);`i4|StwG;+KSU?^IwJhwqk34VgEBAIzxM8v(+0C+)_M6E}a?Z&) z-}(Rl{O3DAHOtH5e*_x<7XTVS7(g6=nNH<{fR28%^95Xe8sFdzu@ucO;pYvP*c{Bf`#`4ZIAqEsd=5~h^}w!7um z_lnwDufiO&4xW}iPq#GV3%Dr1TS@&SU)uJF+7YkHPOQ}EvP=?#RHib-nDlvD;<(?f zMCJws(;`QLeA1I`jt!Gz+_?1r5O*3tLZMCd&qc}`JBpN_0r)(~np)=kB+Yaqm_{xI z6~Nc~MeT64#*DAhn2K(@1DM)4H~tGg5x&G3C;e_E=65SRfN`r@#NUmHvm-MnY~zf! zcGl>4&!uepyGvb%q$88-T!pI$<^b7Q`vIrc#Dc1*QP>(L$?Y&C{piT@I{voYHI z0zm0~UBZv+W8AdN>4;m8IJHk-FP2~U#G(5Ev}C%pM+^2wve~X5>R?UBM2V|Q@8nI2 zuamf2-gT+x+zEQZ;x@-3I&BjKVa5#a7qzCXp7?VS#ykih=nJ@vEMDtIurFePxZ&I$ zQT%&5nCRe_N-_TS2+#J&YH;^=n4`P^p8Y!*PF%iN&u&Q0hgTbqIsDw4df0! zy}nFZe8{1Fn%Ox_VTKOS=mDASZ@Fdvo5eB_1E2MU+_exSkN_P1jVHdmg)>@u8{Al+ z?)|GvSqO2fg*b&Un;fvukSvzFzup49&qL4wZ1 z4sGWe8R2WQb#f-STO<4oq9-jyb3+Ldl{$9$ zMd#Y8EQcb6IbnWQsZP%%>gYxiOe*7t+U=`HT9Q2lol2haD{vT;b8(wv1%TQHZzw;il)7N;+mmnE8_}(sIS*cE!rW(op>MM~q z?DOYJY&j^Wwezy`P`mr~$kdFmj)hctxciQcXY$in>-q=;BHf}DBKi+*QmwMBKJ+Tu@bh>^? zt7FX|m8m8Tr-j7X-+JQDTZbX9i=SvdBBb9hR5!otQg-6&?Xpdc+Ww8CZ9EB5i&c4i1J+XWfHVK&?QW}J7{~fFhLR9(x2NB=U=LfJrQBdMr)_n3`^BC z`-_y7jRop%he0_8X!K-~C6Mt%$VHHkQ|3^?phgc-nL(|b(YmHQ_6(48Yu3m4HCU49 z!c*jJa=@v*KRe9dd0T{^X{ni`iYk-VvmIxvvF>hkX4lSgCw!! zv5jTYa~C;dcb$}c0hU;&m5N5^WwJmOE+JuL|H4 z@~sbM`Je80E1?5U?O=t*#AikLn;9VdZ{CQeikGQFLJyOfq9v`4`^QOa{UN8e?bR}g zq>`gnNj4|B{=#}dwfNog#~N+6)A=dx^002ov JPDHLkV1n4*FopmC literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta new file mode 100644 index 0000000000..1461cc767c --- /dev/null +++ b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 96507c7d33a95834ab2e3cf8d31c85dd +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: 2 + 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: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c02fe6cb16feb0a4a8fc1aa9de52fb2f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FormationAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 7c794a13f0..01ce93fede 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -63302,17 +63302,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8903392646292273362} - m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 491038039515440220} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + 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: 60, y: -55.000015} - m_SizeDelta: {x: 60, y: 60} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4972066190102128193 CanvasRenderer: @@ -63335,14 +63335,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, 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_Sprite: {fileID: 21300000, guid: 3d49dff9e68d99042b98190141718524, type: 3} + m_Sprite: {fileID: 21300000, guid: 96507c7d33a95834ab2e3cf8d31c85dd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1