From 6c9a8c7687253382003d6d5727ae9464739aae75 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Mon, 21 Dec 2020 13:43:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC]=20?=
=?UTF-8?q?=E9=A2=84=E8=AE=BE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ExpeditionMonsterInfoPopup.prefab | 32 +-
.../FourElementMonsterCampPanel.prefab | 474 +++++++++++++-----
.../MonsterCamp/MonsterCampMainPanel.prefab | 96 +---
.../View/GeneralBigPopup_ShenYingShuXing.lua | 2 +-
.../MonsterCamp/MonsterCampMainPanel.lua | 2 +-
.../~Lua/Modules/Net/NetManager.lua | 2 +-
.../Modules/SacredTree/SacredTreeManager.lua | 19 +-
.../Modules/SacredTree/SacredTreePanel.lua | 2 +-
8 files changed, 395 insertions(+), 234 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
index 75bfacb3fb..e745722c09 100644
--- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
@@ -28512,10 +28512,10 @@ RectTransform:
m_Father: {fileID: 3404279405243076626}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 163, y: -35}
+ m_SizeDelta: {x: 76, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6915921386120270260
CanvasRenderer:
@@ -33863,10 +33863,10 @@ RectTransform:
m_Father: {fileID: 3404279405243076626}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 97.5, y: -35}
+ m_SizeDelta: {x: 55, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5498398686762856135
CanvasRenderer:
@@ -35650,7 +35650,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 331, y: -171}
+ m_AnchoredPosition: {x: 368, y: -171}
m_SizeDelta: {x: 127, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8825816331412522549
@@ -35681,7 +35681,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: e4427c9bb4208c642b0f3d059959fb90, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 768a30a7d6617f544abcd0f41055bdad, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@@ -48041,10 +48041,10 @@ RectTransform:
m_Father: {fileID: 3404279405243076626}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 40, y: -35}
+ m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &286124065444150248
CanvasRenderer:
@@ -48193,7 +48193,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &3363796285663876381
RectTransform:
m_ObjectHideFlags: 0
@@ -48274,7 +48274,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -582.6}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 221, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4644864955242000865
CanvasRenderer:
diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab
index 6035795161..b88757dd53 100644
--- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab
@@ -29,19 +29,20 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 4278265088066961057}
- {fileID: 6904335295709927475}
- {fileID: 1331965263365484713}
- {fileID: 7675898885454246158}
- - {fileID: 402076064177301732}
- {fileID: 4338331143962917799}
+ - {fileID: 402076064177301732}
- {fileID: 7806638948486298782}
m_Father: {fileID: 7806638948721940619}
- m_RootOrder: 0
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 451.2, y: -102.81}
- m_SizeDelta: {x: 1080.7, y: 205.6}
+ m_AnchoredPosition: {x: 540.27, y: -188.5}
+ m_SizeDelta: {x: 1035.2, y: 376.99}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7338568884172034449
CanvasRenderer:
@@ -58,7 +59,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 21649783248378182}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -71,7 +72,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: 92da167ad41a9c14e8df530c0233c901, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4346d9a8da5bc1c4ab00c1f943a4bfb7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -216,12 +217,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7806638948147681323}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 414.6, y: 576}
- m_SizeDelta: {x: 58, y: 58}
+ m_AnchoredPosition: {x: 438, y: 597.4}
+ m_SizeDelta: {x: 127, y: 126}
m_Pivot: {x: 0.49999994, y: 0.5}
--- !u!222 &5275389917384150032
CanvasRenderer:
@@ -251,7 +252,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: 896bbd5f2e861c945a3ca228d7c37081, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3a71686756aace84bafe81a0e05f41b9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -333,11 +334,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7806638948147681323}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 414.6, y: 696.00006}
+ m_AnchoredPosition: {x: 438.5, y: 731.9}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4269923484805502012
@@ -436,7 +437,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &3440848409550460175
RectTransform:
m_ObjectHideFlags: 0
@@ -522,15 +523,15 @@ RectTransform:
m_GameObject: {fileID: 1135975243079468381}
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: 1331965263365484713}
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: 27.48, y: 1.26}
- m_SizeDelta: {x: 163.04, y: 35.86}
+ m_AnchoredPosition: {x: 20.44, y: 1.22}
+ m_SizeDelta: {x: 187.22, y: 15.94}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3060635739389423298
CanvasRenderer:
@@ -566,14 +567,14 @@ MonoBehaviour:
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
- m_MaxSize: 59
+ m_MaxSize: 300
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: 9999
+ m_Text: 999999
--- !u!114 &7906900196310211933
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -586,7 +587,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
m_Name:
m_EditorClassIdentifier:
- _textSpacing: -30.76
+ _textSpacing: -36.2
--- !u!1 &1821530346352685742
GameObject:
m_ObjectHideFlags: 0
@@ -621,8 +622,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 640, y: 960}
+ m_AnchoredPosition: {x: 0, y: 1}
+ m_SizeDelta: {x: 640, y: 958.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6498865981382415049
CanvasRenderer:
@@ -833,7 +834,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -12.96, y: 5.91}
+ m_AnchoredPosition: {x: -0.0000019073, y: -1.62}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &857682402620420529
@@ -907,8 +908,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -84.4}
- m_SizeDelta: {x: 328, y: 178}
+ m_AnchoredPosition: {x: -4.3112, y: -82.06}
+ m_SizeDelta: {x: 225.84, y: 122.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5025838386417030140
CanvasRenderer:
@@ -981,7 +982,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.000061035, y: 59.5}
+ m_AnchoredPosition: {x: -17.21, y: 42.7}
m_SizeDelta: {x: 405.1, y: 41.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2050254799821887389
@@ -1013,19 +1014,19 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 30
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
- m_Alignment: 4
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: New Text
+ m_Text: "\u6311\u6218\u5956\u52B1"
--- !u!1 &2543140424935520664
GameObject:
m_ObjectHideFlags: 0
@@ -1059,12 +1060,12 @@ RectTransform:
- {fileID: 2025477594251091228}
- {fileID: 6141158140942588348}
m_Father: {fileID: 5915792893035856279}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -50.55, y: -118.990005}
- m_SizeDelta: {x: 384, y: 112}
+ m_AnchoredPosition: {x: 2.7912, y: -139.98}
+ m_SizeDelta: {x: 246.02, y: 71.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3038910061454878525
CanvasRenderer:
@@ -1135,6 +1136,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &2578585461750395590
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3109173601764913313}
+ - component: {fileID: 745999740506147072}
+ - component: {fileID: 2620372975703031364}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3109173601764913313
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2578585461750395590}
+ 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: 7806638948721940619}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 13, y: -0.5}
+ m_SizeDelta: {x: 26, y: 381.79}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &745999740506147072
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2578585461750395590}
+ m_CullTransparentMesh: 0
+--- !u!114 &2620372975703031364
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2578585461750395590}
+ 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: 8b902e4aa1f16d148ad0cd8e54bde3cb, 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 &2653025273449119411
GameObject:
m_ObjectHideFlags: 0
@@ -1162,15 +1237,15 @@ RectTransform:
m_GameObject: {fileID: 2653025273449119411}
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: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7806638948486298782}
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: 170.94, y: 49.86}
- m_SizeDelta: {x: 446.14, y: 336}
+ m_AnchoredPosition: {x: 190.05998, y: 78.3}
+ m_SizeDelta: {x: 419.72, y: 129}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1586068905160460753
CanvasRenderer:
@@ -1200,7 +1275,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: c65229ed443ab0b4fa61b949bfdb1fef, type: 3}
+ m_Sprite: {fileID: 21300000, guid: fe81435f08079ee4bb0193742fa6ff62, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1219,7 +1294,6 @@ GameObject:
m_Component:
- component: {fileID: 176440091997260688}
- component: {fileID: 2464227703742250129}
- - component: {fileID: 5469349435612083314}
m_Layer: 5
m_Name: bottomLayout
m_TagString: Untagged
@@ -1243,7 +1317,7 @@ RectTransform:
- {fileID: 5075218065937803515}
- {fileID: 196186067740596525}
m_Father: {fileID: 7806638948147681323}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1258,27 +1332,72 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2690083906622940835}
m_CullTransparentMesh: 0
---- !u!114 &5469349435612083314
+--- !u!1 &2709646203279887644
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4278265088066961057}
+ - component: {fileID: 6666057153114714632}
+ - component: {fileID: 6331612054554935666}
+ m_Layer: 5
+ m_Name: title
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4278265088066961057
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2709646203279887644}
+ 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: 5915792893035856279}
+ 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: -393.52, y: 148.02}
+ m_SizeDelta: {x: 81.56, y: 81.56}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6666057153114714632
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2709646203279887644}
+ m_CullTransparentMesh: 0
+--- !u!114 &6331612054554935666
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2690083906622940835}
+ m_GameObject: {fileID: 2709646203279887644}
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: 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: 0}
+ m_Sprite: {fileID: 21300000, guid: c99b1bcbb86e70544b89d8c8295d5cd1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6339,8 +6458,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.02002, y: 118.43}
- m_SizeDelta: {x: 221.93, y: 527.26}
+ m_AnchoredPosition: {x: -2.28, y: 49.04}
+ m_SizeDelta: {x: 166.18, y: 361.92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7079664994702044868
CanvasRenderer:
@@ -6471,7 +6590,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 414.6, y: 823.2}
+ m_AnchoredPosition: {x: 438.5, y: 844.5}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1883945852554000627
@@ -6588,8 +6707,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 507.9, y: 20.775}
- m_SizeDelta: {x: 50.2, y: 50.2}
+ m_AnchoredPosition: {x: 497.2, y: 51.9}
+ m_SizeDelta: {x: 40, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534964552133398209
CanvasRenderer:
@@ -6619,7 +6738,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: c8bec847a2c18c64e907c4b403d5e998, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 166b59b1a76c77044961d5c7aa65ccba, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6781,8 +6900,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -68.1, y: 0}
- m_SizeDelta: {x: 631.5, y: 126}
+ m_AnchoredPosition: {x: -13.6, y: 35.115}
+ m_SizeDelta: {x: 0, y: 70.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3297695668373979833
CanvasRenderer:
@@ -6805,7 +6924,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.8313726, g: 0.8117648, b: 0.654902, a: 1}
+ m_Color: {r: 1, g: 0.7137255, b: 0.47450984, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -6814,7 +6933,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 40
+ m_FontSize: 47
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -6825,7 +6944,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: New Text
+ m_Text:
--- !u!1 &4734946817931983232
GameObject:
m_ObjectHideFlags: 0
@@ -6991,8 +7110,8 @@ MonoBehaviour:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
- m_PreferredWidth: 75
- m_PreferredHeight: 75
+ m_PreferredWidth: 50
+ m_PreferredHeight: 50
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
@@ -7137,7 +7256,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 48
+ m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -7183,7 +7302,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 348.1, y: -14.8}
+ m_AnchoredPosition: {x: 359.9, y: 8.4}
m_SizeDelta: {x: 237.8, y: 29.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6067264358511219413
@@ -7216,7 +7335,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 30
+ m_FontSize: 33
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -7227,7 +7346,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: New Text
+ m_Text:
--- !u!1 &5221969845250895087
GameObject:
m_ObjectHideFlags: 0
@@ -7245,7 +7364,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4338331143962917799
RectTransform:
m_ObjectHideFlags: 0
@@ -7262,8 +7381,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -44.3938, y: 37.9}
- m_SizeDelta: {x: 151.65, y: 75.9}
+ m_AnchoredPosition: {x: -0.000011928, y: 9.02}
+ m_SizeDelta: {x: 142.21, y: 205.12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2905438704931896490
CanvasRenderer:
@@ -7293,7 +7412,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: 66fefd4f9e959a042adaf81e03e79435, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7476,6 +7595,80 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+--- !u!1 &6006405352771499450
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1989403210272614212}
+ - component: {fileID: 7227405210738442601}
+ - component: {fileID: 7835222460171173764}
+ m_Layer: 5
+ m_Name: Image (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1989403210272614212
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006405352771499450}
+ 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: 7806638948721940619}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -13.2, y: -0.5}
+ m_SizeDelta: {x: 26, y: 381.79}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7227405210738442601
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006405352771499450}
+ m_CullTransparentMesh: 0
+--- !u!114 &7835222460171173764
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006405352771499450}
+ 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: 8b902e4aa1f16d148ad0cd8e54bde3cb, 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 &6456471080801773114
GameObject:
m_ObjectHideFlags: 0
@@ -7510,8 +7703,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -6.81, y: 1.6082}
- m_SizeDelta: {x: 318.22, y: 108.81}
+ m_AnchoredPosition: {x: 0.86, y: -6.06}
+ m_SizeDelta: {x: 209.41, y: 71.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8045465284695794612
CanvasRenderer:
@@ -7584,8 +7777,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 286, y: 460}
+ m_AnchoredPosition: {x: -0.24999, y: -28.755}
+ m_SizeDelta: {x: 186.9, y: 307.67}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &758300974510654774
CanvasRenderer:
@@ -7615,7 +7808,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: 4ecfa3d51ceda6d47849bea7d4a00118, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7691,7 +7884,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 48
+ m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -7739,8 +7932,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 1.4, y: 813.30005}
- m_SizeDelta: {x: 467.7, y: 53.1}
+ m_AnchoredPosition: {x: 12.538, y: 840.7}
+ m_SizeDelta: {x: 322.83, y: 41.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6493418260395404975
CanvasRenderer:
@@ -7770,7 +7963,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: 26ce1a2f8851e004e88e569a15a5a1f8, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 801e9a44a4f15e0459b0a28521b99ecb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7889,12 +8082,12 @@ RectTransform:
m_Children:
- {fileID: 7806638948968700937}
m_Father: {fileID: 5915792893035856279}
- m_RootOrder: 0
+ 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: -381, y: -0.000024796}
- m_SizeDelta: {x: 250.55, y: 205.6}
+ m_AnchoredPosition: {x: -393.4, y: 67.9}
+ m_SizeDelta: {x: 152, y: 234}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &168394776550913998
CanvasRenderer:
@@ -7911,7 +8104,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7525962529953566322}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -7924,7 +8117,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: cc38059566467b640ba18e176c983ac6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -8788,8 +8981,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -2.93}
- m_SizeDelta: {x: 301.8, y: 465.87}
+ m_AnchoredPosition: {x: -1.0706, y: -22.03}
+ m_SizeDelta: {x: 219.36, y: 344.04}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7609523647259561928
CanvasRenderer:
@@ -9771,8 +9964,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.02, y: -102.7}
- m_SizeDelta: {x: 170.79999, y: 30}
+ m_AnchoredPosition: {x: -6.2717, y: -101.59}
+ m_SizeDelta: {x: 158.22, y: 27.79}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7609523647849518851
CanvasRenderer:
@@ -10361,9 +10554,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -110.2, y: 166.39995}
+ m_AnchoredPosition: {x: -75.7, y: 79}
m_SizeDelta: {x: 36, y: 36}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0.49999994, y: 0.5000001}
--- !u!222 &7678547162603043524
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -10444,12 +10637,12 @@ RectTransform:
- {fileID: 7675930968000013130}
- {fileID: 7887656077723248584}
m_Father: {fileID: 5915792893035856279}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -49, y: 88}
- m_SizeDelta: {x: 50.91, y: 84.7}
+ m_AnchoredPosition: {x: 3.1, y: 18.8}
+ m_SizeDelta: {x: 246.6, y: 245.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4523287822350384341
CanvasRenderer:
@@ -10556,7 +10749,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -110.7, y: 101}
+ m_AnchoredPosition: {x: -75.7, y: 8}
m_SizeDelta: {x: 34, y: 144}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7678435291470907798
@@ -10628,11 +10821,11 @@ RectTransform:
m_Father: {fileID: 7806638948486298782}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: -0.000065853026, y: 38.65}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -0.000047971193, y: 38.649918}
m_SizeDelta: {x: 0, y: 118.97}
- m_Pivot: {x: -0.000000037252903, y: 1}
+ m_Pivot: {x: 1, y: 1}
--- !u!114 &7806638948134227578
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10660,12 +10853,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 10
- m_Right: 0
- m_Top: 0
+ m_Left: 0
+ m_Right: -38
+ m_Top: 14
m_Bottom: 0
- m_ChildAlignment: 0
- m_Spacing: -30.23
+ m_ChildAlignment: 2
+ m_Spacing: -37.26
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@@ -10704,9 +10897,9 @@ RectTransform:
- {fileID: 8343963279466766131}
- {fileID: 7806638948721940619}
- {fileID: 7806638949837101822}
- - {fileID: 176440091997260688}
- {fileID: 3966417162464893792}
- {fileID: 3409865561245001776}
+ - {fileID: 176440091997260688}
- {fileID: 1257113198445388884}
m_Father: {fileID: 7806638949382057690}
m_RootOrder: 0
@@ -10731,7 +10924,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7806638948147681332}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -10744,7 +10937,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: 45aef590d14491346b83ae735506ed56, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d1f7c79c4d2d0ce43af3940d4b914856, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -10829,8 +11022,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -0.00049591, y: -25.918}
- m_SizeDelta: {x: 1080.9, y: 100}
+ m_AnchoredPosition: {x: -0.31, y: -20.55}
+ m_SizeDelta: {x: 434.1, y: 75.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7806638948266605399
CanvasRenderer:
@@ -10909,12 +11102,12 @@ RectTransform:
- {fileID: 6761671893680758465}
- {fileID: 7806638948134227524}
m_Father: {fileID: 5915792893035856279}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 299, y: 22.479996}
- m_SizeDelta: {x: 405.1, y: 160.64}
+ m_AnchoredPosition: {x: 312.46, y: -108.17}
+ m_SizeDelta: {x: 399.92, y: 160.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7806638948486298780
MonoBehaviour:
@@ -10996,14 +11189,16 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 3109173601764913313}
+ - {fileID: 1989403210272614212}
- {fileID: 5915792893035856279}
m_Father: {fileID: 7806638948147681323}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 625.8, y: 1250}
- m_SizeDelta: {x: 908.4, y: 171.2}
+ m_AnchoredPosition: {x: 540, y: -356.9}
+ m_SizeDelta: {x: 1080, y: 377}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1948123316515751128
CanvasRenderer:
@@ -11047,8 +11242,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.0050049, y: 46.645}
- m_SizeDelta: {x: 250.54, y: 112.31}
+ m_AnchoredPosition: {x: 0.0000030994, y: -21.93}
+ m_SizeDelta: {x: 250.54, y: 43.86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7806638948968700943
CanvasRenderer:
@@ -11071,7 +11266,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.99215686, g: 0.84705883, b: 0.5294118, a: 1}
+ m_Color: {r: 1, g: 0.69803923, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -11080,7 +11275,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 44
+ m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@@ -11088,10 +11283,10 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u7B2C326\u6CE2"
+ m_Text: "\u7B2C55\u5C42"
LanguageIndex: 10238
--- !u!1 &7806638949382057691
GameObject:
@@ -11104,6 +11299,8 @@ GameObject:
- component: {fileID: 7806638949382057690}
- component: {fileID: 7806638949382057688}
- component: {fileID: 7806638949382057689}
+ - component: {fileID: 5639887677019715418}
+ - component: {fileID: 2410433281890906830}
m_Layer: 5
m_Name: FourElementMonsterCampPanel
m_TagString: Untagged
@@ -11169,6 +11366,43 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!222 &5639887677019715418
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7806638949382057691}
+ m_CullTransparentMesh: 0
+--- !u!114 &2410433281890906830
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7806638949382057691}
+ 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: c8fc47fc129b0404f98a695a0ddb775e, 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 &7806638949837101823
GameObject:
m_ObjectHideFlags: 0
@@ -11201,8 +11435,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 1.75, y: 759}
- m_SizeDelta: {x: 904.6, y: 1568.5}
+ m_AnchoredPosition: {x: -0.000061035, y: 804.48}
+ m_SizeDelta: {x: 1080, y: 1613.98}
m_Pivot: {x: 0.49999997, y: 1}
--- !u!1 &7831067964093048782
GameObject:
@@ -11235,11 +11469,11 @@ RectTransform:
m_Children:
- {fileID: 6758774463861388183}
m_Father: {fileID: 5915792893035856279}
- m_RootOrder: 1
+ 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: -397.27, y: -64.452}
+ m_AnchoredPosition: {x: -388.2, y: 97.7}
m_SizeDelta: {x: 218, y: 88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1798275871522754023
@@ -11446,7 +11680,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 348.1, y: 20.775005}
+ m_AnchoredPosition: {x: 348.1, y: 54.4}
m_SizeDelta: {x: 237.8, y: 41.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8588098953417726032
@@ -11479,7 +11713,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 30
+ m_FontSize: 33
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -11490,7 +11724,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: New Text
+ m_Text:
--- !u!1 &8952587488620560879
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab
index d1bd3c828b..a86521ebb1 100644
--- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab
@@ -1002,7 +1002,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -0.0025024, y: 0}
+ m_AnchoredPosition: {x: -0.0025024414, y: 0}
m_SizeDelta: {x: -0.0050049, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2112863120288633553
@@ -2556,15 +2556,14 @@ RectTransform:
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: 6892670266317390683}
+ m_Children: []
m_Father: {fileID: 3961690423647271749}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 434.4, y: -512.8}
- m_SizeDelta: {x: 180.8, y: 167.7}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: -76.5, y: 89.099976}
+ m_SizeDelta: {x: 153, y: 153}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6574980211158226527
CanvasRenderer:
@@ -2594,8 +2593,8 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 0afcaaf43a0c4744bb8b70d268045136, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -2772,85 +2771,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8314253426226152059}
m_CullTransparentMesh: 0
---- !u!1 &8535180316363342473
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6892670266317390683}
- - component: {fileID: 8595669744639761021}
- - component: {fileID: 2697254366676855139}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6892670266317390683
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8535180316363342473}
- 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: 2324327699674677198}
- 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: -46.8}
- m_SizeDelta: {x: 0, y: -93.6}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8595669744639761021
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8535180316363342473}
- m_CullTransparentMesh: 0
---- !u!114 &2697254366676855139
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8535180316363342473}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.86666673, g: 0.73333335, b: 0.454902, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 30
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u795E\u5E94\u5C5E\u6027\n8\u300116"
--- !u!1 &8549744472592868464
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua
index 152dae13f4..8da29d98ed 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua
@@ -44,7 +44,7 @@ function this:OnShow(_parent)
go.gameObject:SetActive(true)
local name = Util.GetGameObject(go,"name"):GetComponent("Text")
local num = Util.GetGameObject(go,"num"):GetComponent("Text")
- if SacredTreeManager.towerLevel >= data[i].allNum then
+ if SacredTreeManager.GetTowerLevel() >= data[i].allNum then
name.text = ""..PropertyConfig[data[i].id].Info..":"
num.text = "".."四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")"
else
diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua
index 92e905e674..419638f413 100644
--- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua
@@ -35,7 +35,7 @@ function MonsterCampMainPanel:BindEvent()
end)
Util.AddClick(this.btnShenYing, function ()
-
+ UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenYingShuXing)
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 83d58accb4..dac04813dc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -113,7 +113,7 @@ function this.PlayerInfoRequest(func)
PlayerManager.skin = msg.player.decrotion--皮肤
PlayerManager.ride = msg.player.ride--坐骑
PlayerManager.rideLevel = msg.player.rideLevel
- SacredTreeManager.treeLevel = msg.player.treeLevel
+ --SacredTreeManager.treeLevel = msg.player.treeLevel
if msg.player.sex then
NameManager.SetRoleSex(msg.player.sex)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
index b006d90df5..e29229b566 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
@@ -6,7 +6,6 @@ local jewerLevelUpConfig = ConfigManager.GetConfig(ConfigName.JewelRankupConfig)
function this.Initialize()
this.treeLevel = 0
- this.towerLevel = 30
this.treeLevelConfig={}
this.getGodHoodTreeLevelConfigData()
@@ -23,6 +22,10 @@ function this.OnPowerChange(oldPower)
end
end
+function this.GetTowerLevel()
+ return MonsterCampManager.GetFourElementTotalWave()
+end
+
--树等级表数据
function this.getGodHoodTreeLevelConfigData()
for i, v in ConfigPairs(treeLevelConfig) do
@@ -32,11 +35,12 @@ end
--神应属性数据
function this.getGodHoodTreeSettingData()
+ local wave = this.GetTowerLevel()
local data = treeSetting[0].PropertyUnlcokLevelForClient
for i = 1, #data do
local tempTable = {}
tempTable.id = data[i][1]
- tempTable.curNum = data[i][2] >= this.towerLevel and this.towerLevel or data[i][2]
+ tempTable.curNum = data[i][2] >= wave and wave or data[i][2]
tempTable.allNum = data[i][2]
table.insert(this.treeSettingData,tempTable)
end
@@ -44,11 +48,12 @@ end
--计算神应等级
function this.CulAttri()
+ local wave = this.GetTowerLevel()
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
local level = 0
for i = 1, #attriConfig.PropertyUnlcokLevels do
local num = attriConfig.PropertyUnlcokLevels[i][2]
- if this.towerLevel >= num then
+ if wave >= num then
level = level + 1
end
end
@@ -57,12 +62,13 @@ end
--计算开启下一神应等级还需要的层数
function this.CulNextAttri()
+ local wave = this.GetTowerLevel()
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
local numLeft = 0
for i = 1, #attriConfig.PropertyUnlcokLevels do
local num = attriConfig.PropertyUnlcokLevels[i][2]
- if this.towerLevel < num then
- numLeft = num - this.towerLevel
+ if wave < num then
+ numLeft = num - this.GetTowerLevel()
end
end
return numLeft
@@ -70,11 +76,12 @@ end
--计算开启下一神应等级的层数
function this.NextAttriFloor()
+ local wave = this.GetTowerLevel()
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
local numLeft = 0
for i = 1, #attriConfig.PropertyUnlcokLevels do
local num = attriConfig.PropertyUnlcokLevels[i][2]
- if this.towerLevel < num then
+ if wave < num then
return num
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
index cfa53ffeaf..4d4ffa3c67 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
@@ -71,7 +71,7 @@ function SacredTreePanel:OnOpen()
end
function SacredTreePanel:OnShow()
curTreeLevel = SacredTreeManager.treeLevel
- curTowerLevel = SacredTreeManager.towerLevel
+ curTowerLevel = SacredTreeManager.GetTowerLevel()
length = LengthOfTable(SacredTreeManager.treeLevelConfig)
Util.SetGray(self.upgradeBtn,curTreeLevel >= length)