From 87c1193f8bcba58c94cb9ef94f470050f42a29f9 Mon Sep 17 00:00:00 2001
From: xiejun <467745540@qq.com>
Date: Wed, 30 Aug 2023 21:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UI/QiJieShiLian/QiJieShiLianPanel.prefab | 827 +++++++++++++++++-
.../Modules/Battle/View/Unit/MonsterView.lua | 62 +-
.../QiJieShiLian/QiJieShiLianPanel.lua | 4 +-
3 files changed, 826 insertions(+), 67 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
index a6b9d258e4..f8cfb4df01 100644
--- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
@@ -120,7 +120,7 @@ RectTransform:
- {fileID: 96579808}
- {fileID: 1191003937}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 15
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -331,6 +331,81 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &69386839
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 69386840}
+ - component: {fileID: 69386842}
+ - component: {fileID: 69386841}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &69386840
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 69386839}
+ 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: 1455872922}
+ m_Father: {fileID: 7696306965927698306}
+ 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: 179, y: 167}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &69386842
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 69386839}
+ m_CullTransparentMesh: 0
+--- !u!114 &69386841
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 69386839}
+ 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: 915d573e7d842de4987ea30d7f4500f4, 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 &96579807
GameObject:
m_ObjectHideFlags: 0
@@ -589,7 +664,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 14
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2191,6 +2266,101 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 360297843}
m_CullTransparentMesh: 0
+--- !u!1 &370985040
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 370985041}
+ - component: {fileID: 370985044}
+ - component: {fileID: 370985043}
+ - component: {fileID: 370985042}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &370985041
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 370985040}
+ 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: 1541985006}
+ 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: -54}
+ m_SizeDelta: {x: 227.9, y: 187.9}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &370985044
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 370985040}
+ m_CullTransparentMesh: 0
+--- !u!114 &370985043
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 370985040}
+ 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.98823535, g: 0.98823535, b: 0.97647065, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 42
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 42
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u6392\u884C"
+--- !u!114 &370985042
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 370985040}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &383295097
GameObject:
m_ObjectHideFlags: 0
@@ -2418,6 +2588,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 5/5
+--- !u!1 &405460454
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 405460455}
+ - component: {fileID: 405460457}
+ - component: {fileID: 405460456}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &405460455
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 405460454}
+ 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: 2296072828586068951}
+ 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: 183, y: 181}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &405460457
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 405460454}
+ m_CullTransparentMesh: 0
+--- !u!114 &405460456
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 405460454}
+ 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: 205e0887605d81c408556ea6002f58b0, 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 &429346316
GameObject:
m_ObjectHideFlags: 0
@@ -3880,7 +4124,7 @@ RectTransform:
m_Children:
- {fileID: 217644621}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -6652,7 +6896,7 @@ RectTransform:
m_Children:
- {fileID: 1939170495}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@@ -8234,6 +8478,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1338919629
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1338919630}
+ - component: {fileID: 1338919632}
+ - component: {fileID: 1338919631}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1338919630
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1338919629}
+ 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: 1343722299391274059}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 183, y: 181}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1338919632
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1338919629}
+ m_CullTransparentMesh: 0
+--- !u!114 &1338919631
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1338919629}
+ 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: 70dd9afd8bd4dfb4d970a00a40239b60, 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 &1355314938
GameObject:
m_ObjectHideFlags: 0
@@ -8688,6 +9006,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1455872921
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1455872922}
+ - component: {fileID: 1455872925}
+ - component: {fileID: 1455872924}
+ - component: {fileID: 1455872923}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1455872922
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1455872921}
+ 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: 69386840}
+ 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: -54}
+ m_SizeDelta: {x: 227.9, y: 187.9}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1455872925
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1455872921}
+ m_CullTransparentMesh: 0
+--- !u!114 &1455872924
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1455872921}
+ 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.98823535, g: 0.98823535, b: 0.97647065, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 42
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 42
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u5546\u5E97"
+--- !u!114 &1455872923
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1455872921}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &1462785056
GameObject:
m_ObjectHideFlags: 0
@@ -8798,7 +9211,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
@@ -8921,6 +9334,101 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 5/5
+--- !u!1 &1506259850
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1506259851}
+ - component: {fileID: 1506259854}
+ - component: {fileID: 1506259853}
+ - component: {fileID: 1506259852}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1506259851
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1506259850}
+ 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: 1343722299391274059}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -48}
+ m_SizeDelta: {x: 183.1, y: 52.59}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1506259854
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1506259850}
+ m_CullTransparentMesh: 0
+--- !u!114 &1506259853
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1506259850}
+ 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.98823535, g: 0.98823535, b: 0.97647065, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 42
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 42
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 0
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u76EE\u6807\u7279\u6027"
+--- !u!114 &1506259852
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1506259850}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &1513603046
GameObject:
m_ObjectHideFlags: 0
@@ -9266,6 +9774,81 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!1 &1541985005
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1541985006}
+ - component: {fileID: 1541985008}
+ - component: {fileID: 1541985007}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1541985006
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1541985005}
+ 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: 370985041}
+ m_Father: {fileID: 5894037401631485489}
+ 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: 186, y: 165}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1541985008
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1541985005}
+ m_CullTransparentMesh: 0
+--- !u!114 &1541985007
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1541985005}
+ 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: 80d90a20c6d5515449a1d751196e2b60, 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 &1548155078
GameObject:
m_ObjectHideFlags: 0
@@ -10819,6 +11402,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1977908244
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1977908245}
+ - component: {fileID: 1977908248}
+ - component: {fileID: 1977908247}
+ - component: {fileID: 1977908246}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1977908245
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977908244}
+ 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: 2296072828586068951}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -57}
+ m_SizeDelta: {x: 199.3, y: 52.59}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1977908248
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977908244}
+ m_CullTransparentMesh: 0
+--- !u!114 &1977908247
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977908244}
+ 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.98823535, g: 0.98823535, b: 0.97647065, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 42
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 46
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 0
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u76EE\u6807\u7279\u6027"
+--- !u!114 &1977908246
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1977908244}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &1996525953
GameObject:
m_ObjectHideFlags: 0
@@ -11623,7 +12301,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
- m_FontStyle: 1
+ m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
@@ -11712,6 +12390,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3545354181108413397}
+ - {fileID: 4251202470118668870}
- {fileID: 1464442781}
- {fileID: 7489846151590152825}
- {fileID: 5863314382973985130}
@@ -11929,6 +12608,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1667642137099995534
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4251202470118668870}
+ - component: {fileID: 6414403108893325043}
+ - component: {fileID: 4571224734244253839}
+ m_Layer: 5
+ m_Name: bg2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4251202470118668870
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1667642137099995534}
+ 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: 7783183355034074848}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -0.000015258789, y: 410.80005}
+ m_SizeDelta: {x: 1080, y: 904.6}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6414403108893325043
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1667642137099995534}
+ m_CullTransparentMesh: 0
+--- !u!114 &4571224734244253839
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1667642137099995534}
+ 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: 4da69516eac06094f8ef56da4a6d3de5, 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 &1708461686548101437
GameObject:
m_ObjectHideFlags: 0
@@ -12041,7 +12794,7 @@ RectTransform:
- {fileID: 5468684172308790950}
- {fileID: 3285609347965271090}
m_Father: {fileID: 7783183355034074848}
- 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}
@@ -12266,7 +13019,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 43}
+ m_AnchoredPosition: {x: 286, y: 107}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2233407299973094934
@@ -12290,7 +13043,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.7254902, b: 0.44705886, a: 1}
+ m_Color: {r: 0.9803922, g: 0.80392164, b: 0.427451, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -12298,7 +13051,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@@ -12536,7 +13289,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7783183355034074848}
- 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}
@@ -13528,7 +14281,8 @@ 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: []
+ m_Children:
+ - {fileID: 69386840}
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13565,7 +14319,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: 60d33d082cec7074180e3742c2428e67, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -13682,6 +14436,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8648591679292913338}
+ - {fileID: 1338919630}
+ - {fileID: 1506259851}
m_Father: {fileID: 8620339975984362873}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13718,7 +14474,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: a1dd55966ef58074ab8a1d6a4c68979b, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -13874,7 +14630,7 @@ RectTransform:
- {fileID: 8727869433153305732}
- {fileID: 4774812253766355766}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -13910,7 +14666,9 @@ 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: []
+ m_Children:
+ - {fileID: 405460455}
+ - {fileID: 1977908245}
m_Father: {fileID: 8620339975984362873}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13947,7 +14705,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: fb8820ef46bc9914687c155782a90da1, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -14203,7 +14961,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 39, y: 5}
- m_SizeDelta: {x: 38, y: 38}
+ m_SizeDelta: {x: 20, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2392006805030760208
CanvasRenderer:
@@ -14233,7 +14991,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: 34d819da24817504284c9f5fc0cf7355, type: 3}
+ m_Sprite: {fileID: 21300000, guid: ef5dfe4c1721c8543ae19b75beb0860f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -14352,7 +15110,7 @@ RectTransform:
- {fileID: 8449113579031185751}
- {fileID: 8966229890078945109}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -14619,11 +15377,11 @@ RectTransform:
- {fileID: 4140965648919806224}
- {fileID: 1343722299391274059}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 115, y: -550}
+ m_AnchoredPosition: {x: 133, y: -584}
m_SizeDelta: {x: 152.79999, y: 690.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4325798483183739644
@@ -14683,7 +15441,7 @@ RectTransform:
- {fileID: 5101332028863551494}
- {fileID: 2660594101558660080}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -14902,7 +15660,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
- m_FontStyle: 1
+ m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
@@ -14947,11 +15705,11 @@ RectTransform:
m_Children:
- {fileID: 6102151526305028001}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -85, y: -95}
+ m_AnchoredPosition: {x: -85, y: -136}
m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7197382918888777827
@@ -15423,7 +16181,8 @@ 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: []
+ m_Children:
+ - {fileID: 1541985006}
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15460,7 +16219,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: 0ae4375e796ee934997142d1bb379d5d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -15921,7 +16680,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
- m_FontStyle: 1
+ m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
@@ -15965,11 +16724,11 @@ RectTransform:
- {fileID: 508606115173722002}
- {fileID: 7696306965927698306}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -100, y: -550}
+ m_AnchoredPosition: {x: -100, y: -585}
m_SizeDelta: {x: 152.8, y: 690.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5819746221396831673
@@ -15992,7 +16751,7 @@ MonoBehaviour:
m_ChildAlignment: 2
m_StartCorner: 1
m_StartAxis: 1
- m_CellSize: {x: 126, y: 126}
+ m_CellSize: {x: 180, y: 180}
m_Spacing: {x: 0, y: 25}
m_Constraint: 1
m_ConstraintCount: 1
@@ -16167,7 +16926,7 @@ RectTransform:
- {fileID: 367888755464226821}
- {fileID: 1772487640007916265}
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@@ -16348,7 +17107,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7783183355034074848}
- m_RootOrder: 11
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
index b8449800a8..23c93f0af1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua
@@ -73,40 +73,40 @@ function MonsterView:onCreate(go, role, position, root)
self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000)
--
- local combatId = BattleManager.GetCombatIdBySkin(self.role.skill[1],self.skinId)
- self.combat = BattleManager.GetSkillCombat(combatId)
- self.SkillAttackDisplaceoffset=self.combat.AttackDisplaceoffset
- if self.combat.CloseRangeHit~=nil and self.combat.CloseRangeHit~="" then
- self.RoleSkillLiveGo=poolManager:LoadLive(self.combat.CloseRangeHit, go.transform.parent, Vector3.one, Vector3.zero)
- self.RoleSkillLiveGoTran = self.RoleSkillLiveGo:GetComponent("RectTransform")
- self.RoleSkillLiveGoTran:SetParent(self.RoleLiveGO.transform)
- self.RoleSkillLiveGoTran.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
- self.RoleSkillLiveGoTran.localScale = Vector3.one
- self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000)
- self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic")
- self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true)
+ -- local combatId = BattleManager.GetCombatIdBySkin(self.role.skill[1],self.skinId)
+ -- self.combat = BattleManager.GetSkillCombat(combatId)
+ -- self.SkillAttackDisplaceoffset=self.combat.AttackDisplaceoffset
+ -- if self.combat.CloseRangeHit~=nil and self.combat.CloseRangeHit~="" then
+ -- self.RoleSkillLiveGo=poolManager:LoadLive(self.combat.CloseRangeHit, go.transform.parent, Vector3.one, Vector3.zero)
+ -- self.RoleSkillLiveGoTran = self.RoleSkillLiveGo:GetComponent("RectTransform")
+ -- self.RoleSkillLiveGoTran:SetParent(self.RoleLiveGO.transform)
+ -- self.RoleSkillLiveGoTran.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
+ -- self.RoleSkillLiveGoTran.localScale = Vector3.one
+ -- self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000)
+ -- self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic")
+ -- self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true)
- end
+ -- end
- local combatId2 = BattleManager.GetCombatIdBySkin(self.role.superSkill[1],self.skinId)
- self.combat2 = BattleManager.GetSkillCombat(combatId2)
- if self.combat2.CloseRangeHit~=nil and self.combat2.CloseRangeHit~="" then
- self.superSkillAttackDisplaceoffset=self.combat2.AttackDisplaceoffset
- self.RoleSkillLiveGo2=poolManager:LoadLive(self.combat2.CloseRangeHit, go.transform.parent, Vector3.one, Vector3.zero)
- self.RoleSkillLiveGoTran2 = self.RoleSkillLiveGo2:GetComponent("RectTransform")
- self.RoleSkillLiveGoTran2:SetParent(self.RoleLiveGO.transform)
- -- self.RoleSkillLiveGoTran2.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
- self.RoleSkillLiveGoTran2.localPosition = Vector2.New(self.combat2.CloseRangeHitOffset[1], self.combat2.CloseRangeHitOffset[2])-- * 0.5
+ -- local combatId2 = BattleManager.GetCombatIdBySkin(self.role.superSkill[1],self.skinId)
+ -- self.combat2 = BattleManager.GetSkillCombat(combatId2)
+ -- if self.combat2.CloseRangeHit~=nil and self.combat2.CloseRangeHit~="" then
+ -- self.superSkillAttackDisplaceoffset=self.combat2.AttackDisplaceoffset
+ -- self.RoleSkillLiveGo2=poolManager:LoadLive(self.combat2.CloseRangeHit, go.transform.parent, Vector3.one, Vector3.zero)
+ -- self.RoleSkillLiveGoTran2 = self.RoleSkillLiveGo2:GetComponent("RectTransform")
+ -- self.RoleSkillLiveGoTran2:SetParent(self.RoleLiveGO.transform)
+ -- -- self.RoleSkillLiveGoTran2.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
+ -- self.RoleSkillLiveGoTran2.localPosition = Vector2.New(self.combat2.CloseRangeHitOffset[1], self.combat2.CloseRangeHitOffset[2])-- * 0.5
- self.RoleSkillLiveGoTran2.localScale = Vector3.one
- self.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000)
- self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
- -- local t= self.RoleLiveGOGraphic.SkeletonData.animations
- self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
- self.RoleSkillLiveGo2:SetActive(true)
- end
+ -- self.RoleSkillLiveGoTran2.localScale = Vector3.one
+ -- self.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000)
+ -- self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
+ -- -- local t= self.RoleLiveGOGraphic.SkeletonData.animations
+ -- self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
+ -- self.RoleSkillLiveGo2:SetActive(true)
+ -- end
-- casting技能立绘
self.RoleLiveGO2=nil
@@ -323,8 +323,8 @@ function MonsterView:onDispose()
self.RoleLiveGOGraphic2.freeze = false
poolManager:UnLoadLive(self.livePath2, self.RoleLiveGO2)
poolManager:UnLoadLive(self.livePath, self.RoleLiveGO)
- poolManager:UnLoadLive(self.combat2.CloseRangeHit, self.RoleSkillLiveGo2)
- poolManager:UnLoadLive(self.combat.CloseRangeHit, self.RoleSkillLiveGo)
+ -- poolManager:UnLoadLive(self.combat2.CloseRangeHit, self.RoleSkillLiveGo2)
+ -- poolManager:UnLoadLive(self.combat.CloseRangeHit, self.RoleSkillLiveGo)
GameObject.DestroyImmediate(self.RoleLiveGO2)
self.RoleLiveGO2 = nil
heroConfig=nil
diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua
index df42e202a0..8a4732cbde 100644
--- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua
@@ -251,7 +251,7 @@ end
function QiJieShiLianPanel:SetTopBar()
local text = self.qijieData.curRank > 0 and self.qijieData.curRank or "未上榜"
local text2 = self.qijieData.curScore >= 0 and self.qijieData.curScore or "0"
- self.info.text = string.format( "本周排名:%s 本周积分:%s",text,text2)
+ self.info.text = string.format( "本周排名:%s 本周积分:%s",text,text2)
self.name.text = string.format( "%s·%s层",self.configData.Chapter,self.configData.Stage)
end
@@ -263,7 +263,7 @@ function QiJieShiLianPanel:SetBottomBar()
local text = Util.GetGameObject(self.goalList[i],"Text"):GetComponent("Text")
local image = Util.GetGameObject(self.goalList[i],"Image"):GetComponent("Image")
local state = QiJieShiLianManager.CheckGoalIsFinish(self.configData.ConditionValue[i][1],text)--检测是否完成此条目(顺便设置文字)
- local imgname = state and "q_qjsl_wfzjm_yjh" or "q_qjsl_wfzjm_wjh"
+ local imgname = state and "UI_hz_qj_04" or "UI_hz_qj_05"
image.sprite = self.spLoader:LoadSprite(imgname)
end