From 13d2a5f81a7290789754d2443b3b03d98eef4823 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Tue, 25 Aug 2020 18:17:15 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=AE=9D=E7=89=A9?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 35 ++++++++++---------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
index 989b8d4582..4f57b976b4 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
@@ -327,7 +327,7 @@ function this:AllEquipUpBtnOnClick()
LogBlue("装备id:"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower)
end
end
- LogGreen("循环计算每个装备的战力")
+ LogGreen("循环计算每个装备的战力")
for i = 1, #curPosEquip do
local addPower = 0
local curEquip = curPosEquip[i]
@@ -936,13 +936,6 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
elseif _type == 4 then
--一键穿 把身上装备解绑英雄id
if _equipOrTreasure == 1 then
- -- for i=1,#_selectEquipDataList do
- -- local temp = EquipManager.GetSingleHeroSingleEquipData(_selectEquipDataList[i],curHeroData.dynamicId)
- -- if not temp then
- -- LogBlue(_selectEquipDataList[i].." "..curHeroData.dynamicId)
- -- end
- -- end
- --宝物
for n, m in ipairs(_selectEquipDataList) do
local isadd = true
for i = 1, #curHeroData.equipIdList do
@@ -960,16 +953,24 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
end
EquipManager.UpdateEquipData(_selectEquipDataList, curHeroData.dynamicId)
else
- for k, v in ipairs(curHeroData.jewels) do
- EquipTreasureManager.SetTreasureUpOrDown(v, "0")
- end
- curHeroData.jewels = {}
for i = 1, #_selectEquipDataList do
- --把选择的装备绑上英雄
- EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
- --穿
- --再把英雄装备list 清空并添加上新选择的装备
- table.insert(curHeroData.jewels, _selectEquipDataList[i])
+ local isadd = true
+ for i = 1, #curHeroData.jewels do
+ --如果英雄身上有和选中的宝物的位置相同的,就替换
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i]).equipType ==
+ EquipTreasureManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then
+ EquipTreasureManager.SetTreasureUpOrDown(curHeroData.jewels[i], "0")
+ EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
+ table.remove(curHeroData.jewels,i)
+ table.insert(curHeroData.jewels, _selectEquipDataList[i])
+ isadd = false
+ break
+ end
+ end
+ if isadd then
+ EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
+ table.insert(curHeroData.jewels, _selectEquipDataList[i])
+ end
end
end
elseif _type == 5 then
From f223c0c3e1a2fdaaee03d615e4c98356b948a9c4 Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Tue, 25 Aug 2020 18:24:17 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../GuildTranscriptMainPopup.prefab | 2294 ++++++++---------
.../ManagedResources/~Lua/Common/Language.lua | 2 +-
.../Transcript/GuildTranscriptMainPopup.lua | 26 +-
data_execl/Language_data/LanguageLua.csv | 2 +-
4 files changed, 1160 insertions(+), 1164 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab
index ffbe11cde3..bb32140678 100644
--- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab
@@ -74,152 +74,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &386227753262555572
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1581301990849190829}
- - component: {fileID: 5606794141582221883}
- - component: {fileID: 3819719084421478300}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1581301990849190829
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386227753262555572}
- 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: 559353393069320679}
- 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: 77.7, y: -17.8}
- m_SizeDelta: {x: 34.99, y: 39.61}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5606794141582221883
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386227753262555572}
- m_CullTransparentMesh: 0
---- !u!114 &3819719084421478300
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386227753262555572}
- 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: 5facc668a73a35c4e9e2984c18d47865, 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 &582561440459640911
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6814112330040602929}
- - component: {fileID: 5431992699978166312}
- - component: {fileID: 2873104636419421429}
- m_Layer: 5
- m_Name: icon
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6814112330040602929
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 582561440459640911}
- 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: 1324252508207588082}
- 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: 400, y: 600}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5431992699978166312
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 582561440459640911}
- m_CullTransparentMesh: 0
---- !u!114 &2873104636419421429
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 582561440459640911}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 2100000, guid: 1c334a3cabb792e4097c5cc6ef40de17, type: 2}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Texture: {fileID: 8400000, guid: af10186367c1690418d1010bae399c18, type: 2}
- m_UVRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
--- !u!1 &714970786829869310
GameObject:
m_ObjectHideFlags: 0
@@ -856,80 +710,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &1078638299094114054
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4183519265975200628}
- - component: {fileID: 2449043217954512386}
- - component: {fileID: 667883088032250294}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4183519265975200628
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1078638299094114054}
- 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: 8772249490622920571}
- 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: 5.6, y: -19.8}
- m_SizeDelta: {x: 529.96, y: 2.4}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2449043217954512386
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1078638299094114054}
- m_CullTransparentMesh: 0
---- !u!114 &667883088032250294
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1078638299094114054}
- 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: 0.85490197, b: 0.7137255, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
--- !u!1 &1083347448689586688
GameObject:
m_ObjectHideFlags: 0
@@ -965,6 +745,160 @@ RectTransform:
m_AnchoredPosition: {x: 3, y: 13.6}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1624819968934264434
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1161540811707890044}
+ - component: {fileID: 8051377341847353079}
+ - component: {fileID: 7345337527310781020}
+ m_Layer: 5
+ m_Name: icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1161540811707890044
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1624819968934264434}
+ 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: 5272004054932943705}
+ 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: 140, y: 140}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8051377341847353079
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1624819968934264434}
+ m_CullTransparentMesh: 0
+--- !u!114 &7345337527310781020
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1624819968934264434}
+ 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: 157e394dc0ac8c142b13d5bb396503dc, 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 &1663598398450140646
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4113706938333714392}
+ - component: {fileID: 2922873450020944895}
+ - component: {fileID: 7853057268420014078}
+ m_Layer: 5
+ m_Name: name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4113706938333714392
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1663598398450140646}
+ 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: 2017024408334081164}
+ m_RootOrder: 4
+ 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: 442.1, y: 22}
+ m_SizeDelta: {x: 300.6, y: 110}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2922873450020944895
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1663598398450140646}
+ m_CullTransparentMesh: 0
+--- !u!114 &7853057268420014078
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1663598398450140646}
+ 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.98039216, g: 0.83137256, b: 0.61960787, 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: 32
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u80C6\u5B50\u8D85\u7EA7\u5927"
+ LanguageIndex: 11446
--- !u!1 &1663657875254891685
GameObject:
m_ObjectHideFlags: 0
@@ -998,7 +932,7 @@ RectTransform:
- {fileID: 767815585800754228}
- {fileID: 8772249491377495798}
- {fileID: 8772249491134576767}
- - {fileID: 7519002565843392300}
+ - {fileID: 4504879607518897200}
m_Father: {fileID: 9065563071265118532}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1044,6 +978,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1687906732835414293
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9132838768057352266}
+ - component: {fileID: 4504094561734338284}
+ - component: {fileID: 7095142371087381042}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9132838768057352266
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1687906732835414293}
+ 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: 8623671869353108748}
+ 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: 178, y: -101}
+ m_SizeDelta: {x: 253.5, y: 64.4}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504094561734338284
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1687906732835414293}
+ m_CullTransparentMesh: 0
+--- !u!114 &7095142371087381042
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1687906732835414293}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
+ m_RaycastTarget: 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: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 51
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u65E0\u53EF\u5F52\u5143\u7684\u6CD5\u5B9D\uFF01"
+ LanguageIndex: 11516
--- !u!1 &1909906344786005750
GameObject:
m_ObjectHideFlags: 0
@@ -1124,6 +1138,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u626B \u8361"
LanguageIndex: 10123
+--- !u!1 &1909936818509183577
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 519426444444623752}
+ - component: {fileID: 4226950564847516869}
+ - component: {fileID: 4504879607120692463}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &519426444444623752
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1909936818509183577}
+ 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: 8772249490155962334}
+ 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: -4.4, y: -4}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4226950564847516869
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1909936818509183577}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879607120692463
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1909936818509183577}
+ 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: 1, g: 0.7607844, b: 0.5019608, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 28
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u7B2C\u4E5D\u5341\u4E5D\u7AE0"
--- !u!1 &2094238479854537153
GameObject:
m_ObjectHideFlags: 0
@@ -1439,7 +1532,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.7}
m_Children:
- - {fileID: 5098866337464158816}
+ - {fileID: 1161540811707890044}
- {fileID: 648190559353259571}
- {fileID: 5363038980433798925}
m_Father: {fileID: 5573033392981280450}
@@ -1559,6 +1652,160 @@ RectTransform:
m_AnchoredPosition: {x: -0.62846994, y: 68.120026}
m_SizeDelta: {x: 908.06, y: 545.4}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &3320535101665877560
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3320535101665877559}
+ - component: {fileID: 3320535101665877557}
+ - component: {fileID: 3320535101665877558}
+ m_Layer: 5
+ m_Name: mask
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3320535101665877559
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3320535101665877560}
+ 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: 7651931840296368259}
+ 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: -4.01, y: -23.4}
+ m_SizeDelta: {x: 183.66, y: 283.49}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3320535101665877557
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3320535101665877560}
+ m_CullTransparentMesh: 0
+--- !u!114 &3320535101665877558
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3320535101665877560}
+ 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: b03c27bdd3cdd484d980dcdd0e912311, 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 &3360250075950694130
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 374792995007972914}
+ - component: {fileID: 3552291308302863934}
+ - component: {fileID: 1724345306119416998}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &374792995007972914
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3360250075950694130}
+ 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: 2040217664681266899}
+ 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: -3.5, y: 0.00000095367}
+ m_SizeDelta: {x: 157.13, y: 65.07}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3552291308302863934
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3360250075950694130}
+ m_CullTransparentMesh: 0
+--- !u!114 &1724345306119416998
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3360250075950694130}
+ 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: 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: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u6311 \u6218"
+ LanguageIndex: 10123
--- !u!1 &3980545649071436633
GameObject:
m_ObjectHideFlags: 0
@@ -1590,7 +1837,7 @@ RectTransform:
- {fileID: 8916615331666633044}
- {fileID: 5032880434676720338}
- {fileID: 5573033392981280450}
- - {fileID: 8055394334628439236}
+ - {fileID: 4113706938333714392}
- {fileID: 6520394166276042787}
- {fileID: 1592676147051683292}
m_Father: {fileID: 8772249491636870108}
@@ -1833,7 +2080,7 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 5
---- !u!1 &4634439288967236974
+--- !u!1 &4504879607366141966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1841,50 +2088,272 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 5098866337464158816}
- - component: {fileID: 4134425221085562347}
- - component: {fileID: 3689487467355617600}
- m_Layer: 5
- m_Name: icon
+ - component: {fileID: 4504879607366141965}
+ - component: {fileID: 4504879607366141963}
+ - component: {fileID: 4504879607366141964}
+ m_Layer: 0
+ m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &5098866337464158816
+--- !u!224 &4504879607366141965
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4634439288967236974}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_GameObject: {fileID: 4504879607366141966}
+ 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: 5272004054932943705}
+ m_Father: {fileID: 8772249489909623988}
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: 140, y: 140}
+ m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4134425221085562347
+--- !u!222 &4504879607366141963
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4634439288967236974}
+ m_GameObject: {fileID: 4504879607366141966}
m_CullTransparentMesh: 0
---- !u!114 &3689487467355617600
+--- !u!114 &4504879607366141964
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4634439288967236974}
+ m_GameObject: {fileID: 4504879607366141966}
+ 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &4504879607378936451
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4504879607378936450}
+ - component: {fileID: 4504879607378936448}
+ - component: {fileID: 4504879607378936449}
+ m_Layer: 5
+ m_Name: Image (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4504879607378936450
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607378936451}
+ 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: 8772249490015848709}
+ 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: 85.340004, y: -21.700012}
+ m_SizeDelta: {x: 45.77, y: 3.42}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504879607378936448
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607378936451}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879607378936449
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607378936451}
+ 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: ce7b25bccdf92c54abce7f0236c39592, 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 &4504879607518897201
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4504879607518897200}
+ - component: {fileID: 4504879607518897214}
+ - component: {fileID: 4504879607518897215}
+ 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 &4504879607518897200
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607518897201}
+ 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: 8507410457605464740}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.7999878, y: -75}
+ m_SizeDelta: {x: -27.699951, y: -327.80017}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504879607518897214
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607518897201}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879607518897215
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879607518897201}
+ 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: 9658c5a8f1777e74d9a8915414aaa5ac, 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 &4504879608026955302
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4504879608026955301}
+ - component: {fileID: 4504879608026955299}
+ - component: {fileID: 4504879608026955300}
+ m_Layer: 5
+ m_Name: bg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4504879608026955301
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608026955302}
+ 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: 8772249490176231431}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 1.9, y: 14.6}
+ m_SizeDelta: {x: 109, y: 108}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504879608026955299
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608026955302}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879608026955300
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608026955302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -1898,7 +2367,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: 157e394dc0ac8c142b13d5bb396503dc, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 6cd430959bb0f9a458c319e681e10953, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1907,7 +2376,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &4733554678634975753
+--- !u!1 &4504879608079052910
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1915,79 +2384,73 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2909902213397721942}
- - component: {fileID: 7520328574322710000}
- - component: {fileID: 3795218063418474798}
+ - component: {fileID: 4504879608079052909}
+ - component: {fileID: 4504879608079052907}
+ - component: {fileID: 4504879608079052908}
m_Layer: 5
- m_Name: Text
+ m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &2909902213397721942
+--- !u!224 &4504879608079052909
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4733554678634975753}
+ m_GameObject: {fileID: 4504879608079052910}
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: 8623671869353108748}
- m_RootOrder: 0
+ m_Father: {fileID: 8772249490015848709}
+ 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: -13, y: 18}
- m_SizeDelta: {x: 253.5, y: 64.4}
+ m_AnchoredPosition: {x: 85.34, y: 122.7}
+ m_SizeDelta: {x: 45.77, y: 3.42}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7520328574322710000
+--- !u!222 &4504879608079052907
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4733554678634975753}
+ m_GameObject: {fileID: 4504879608079052910}
m_CullTransparentMesh: 0
---- !u!114 &3795218063418474798
+--- !u!114 &4504879608079052908
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4733554678634975753}
+ m_GameObject: {fileID: 4504879608079052910}
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.9882353, g: 0.92156863, b: 0.7921569, a: 1}
- m_RaycastTarget: 0
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 30
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 51
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u65E0\u53EF\u5F52\u5143\u7684\u6CD5\u5B9D\uFF01"
- LanguageIndex: 11516
---- !u!1 &4740629253669762810
+ m_Sprite: {fileID: 21300000, guid: ce7b25bccdf92c54abce7f0236c39592, 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 &4504879608626357013
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1995,78 +2458,220 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8055394334628439236}
- - component: {fileID: 9100773429113719011}
- - component: {fileID: 4190591928027405538}
+ - component: {fileID: 4504879608626357012}
+ - component: {fileID: 4504879608626357010}
+ - component: {fileID: 4504879608626357011}
m_Layer: 5
- m_Name: name
+ m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &8055394334628439236
+--- !u!224 &4504879608626357012
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4740629253669762810}
+ m_GameObject: {fileID: 4504879608626357013}
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: 2017024408334081164}
- m_RootOrder: 4
+ m_Father: {fileID: 8772249490176231431}
+ 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: 442.1, y: 22}
- m_SizeDelta: {x: 300.6, y: 110}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 2.38, y: 14.600008}
+ m_SizeDelta: {x: 97.15, y: 96.27}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9100773429113719011
+--- !u!222 &4504879608626357010
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4740629253669762810}
+ m_GameObject: {fileID: 4504879608626357013}
m_CullTransparentMesh: 0
---- !u!114 &4190591928027405538
+--- !u!114 &4504879608626357011
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4740629253669762810}
+ m_GameObject: {fileID: 4504879608626357013}
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.98039216, g: 0.83137256, b: 0.61960787, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
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: 32
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u80C6\u5B50\u8D85\u7EA7\u5927"
- LanguageIndex: 11446
+ m_Sprite: {fileID: 21300000, guid: e55e2a2d87549ab4b93f51bd066b76f7, 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 &4504879608815052422
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4504879608815052421}
+ - component: {fileID: 4504879608815052419}
+ - component: {fileID: 4504879608815052420}
+ m_Layer: 5
+ m_Name: Image (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4504879608815052421
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608815052422}
+ 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: 8772249490015848709}
+ 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: -88.049995, y: -21.7}
+ m_SizeDelta: {x: 48.59, y: 3.42}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504879608815052419
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608815052422}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879608815052420
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879608815052422}
+ 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: ce7b25bccdf92c54abce7f0236c39592, 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 &4504879609052267277
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4504879609052267276}
+ - component: {fileID: 4504879609052267274}
+ - component: {fileID: 4504879609052267275}
+ 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 &4504879609052267276
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879609052267277}
+ 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: 8772249490015848709}
+ 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: -88.05, y: 122.7}
+ m_SizeDelta: {x: 48.59, y: 3.42}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4504879609052267274
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879609052267277}
+ m_CullTransparentMesh: 0
+--- !u!114 &4504879609052267275
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4504879609052267277}
+ 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: ce7b25bccdf92c54abce7f0236c39592, 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 &4765859750527728654
GameObject:
m_ObjectHideFlags: 0
@@ -2270,7 +2875,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4864250674772076596}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -2388,85 +2993,6 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
---- !u!1 &5502595789150865733
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5902265575477399700}
- - component: {fileID: 7815282441292566489}
- - component: {fileID: 7519002565973686259}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5902265575477399700
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5502595789150865733}
- 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: 8772249490155962334}
- 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: -4.4, y: -4}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7815282441292566489
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5502595789150865733}
- m_CullTransparentMesh: 0
---- !u!114 &7519002565973686259
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5502595789150865733}
- 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: 1, g: 0.7607844, b: 0.5019608, a: 1}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 28
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: "\u7B2C\u4E5D\u5341\u4E5D\u7AE0"
--- !u!1 &5956783656011709218
GameObject:
m_ObjectHideFlags: 0
@@ -2498,7 +3024,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 6048291297600042286}
+ - {fileID: 374792995007972914}
m_Father: {fileID: 9065563071265118532}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2606,6 +3132,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &6016941893761667752
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4840728677684029617}
+ - component: {fileID: 1950908892958937383}
+ - component: {fileID: 7196205303014147200}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4840728677684029617
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6016941893761667752}
+ 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: 559353393069320679}
+ 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: 77.7, y: -17.8}
+ m_SizeDelta: {x: 34.99, y: 39.61}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1950908892958937383
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6016941893761667752}
+ m_CullTransparentMesh: 0
+--- !u!114 &7196205303014147200
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6016941893761667752}
+ 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: 5facc668a73a35c4e9e2984c18d47865, 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 &6199753487855799930
GameObject:
m_ObjectHideFlags: 0
@@ -2635,7 +3235,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 2909902213397721942}
+ - {fileID: 9132838768057352266}
m_Father: {fileID: 8871777805800988043}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2659,7 +3259,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6199753487855799930}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -2863,6 +3463,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &6351279495171468314
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7841479739716687976}
+ - component: {fileID: 8584123713137028382}
+ - component: {fileID: 6888428239798078122}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7841479739716687976
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6351279495171468314}
+ 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: 8772249490622920571}
+ 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: 5.6, y: -19.8}
+ m_SizeDelta: {x: 529.96, y: 2.4}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8584123713137028382
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6351279495171468314}
+ m_CullTransparentMesh: 0
+--- !u!114 &6888428239798078122
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6351279495171468314}
+ 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: 0.85490197, b: 0.7137255, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &6492906222969261897
GameObject:
m_ObjectHideFlags: 0
@@ -3194,6 +3868,78 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &6830267759237522259
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 598072556026970669}
+ - component: {fileID: 2143150787163751220}
+ - component: {fileID: 8143354390938814441}
+ m_Layer: 5
+ m_Name: icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &598072556026970669
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830267759237522259}
+ 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: 1324252508207588082}
+ 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: 400, y: 600}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2143150787163751220
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830267759237522259}
+ m_CullTransparentMesh: 0
+--- !u!114 &8143354390938814441
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830267759237522259}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 1c334a3cabb792e4097c5cc6ef40de17, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Texture: {fileID: 8400000, guid: af10186367c1690418d1010bae399c18, type: 2}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
--- !u!1 &6936209629351402513
GameObject:
m_ObjectHideFlags: 0
@@ -3347,598 +4093,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &7519002565682264850
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002565682264849}
- - component: {fileID: 7519002565682264855}
- - component: {fileID: 7519002565682264848}
- m_Layer: 0
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002565682264849
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565682264850}
- 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: 8772249489909623988}
- 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: 68, y: 68}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002565682264855
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565682264850}
- m_CullTransparentMesh: 0
---- !u!114 &7519002565682264848
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565682264850}
- 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &7519002565702398367
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002565702398366}
- - component: {fileID: 7519002565702398364}
- - component: {fileID: 7519002565702398365}
- m_Layer: 5
- m_Name: Image (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002565702398366
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565702398367}
- 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: 8772249490015848709}
- 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: 85.340004, y: -21.700012}
- m_SizeDelta: {x: 45.77, y: 3.42}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002565702398364
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565702398367}
- m_CullTransparentMesh: 0
---- !u!114 &7519002565702398365
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565702398367}
- 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: ce7b25bccdf92c54abce7f0236c39592, 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 &7519002565843392301
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002565843392300}
- - component: {fileID: 7519002565843392290}
- - component: {fileID: 7519002565843392291}
- 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 &7519002565843392300
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565843392301}
- 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: 8507410457605464740}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0.7999878, y: -75}
- m_SizeDelta: {x: -27.699951, y: -327.80017}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002565843392290
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565843392301}
- m_CullTransparentMesh: 0
---- !u!114 &7519002565843392291
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002565843392301}
- 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: 9658c5a8f1777e74d9a8915414aaa5ac, 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 &7519002566342004026
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002566342004025}
- - component: {fileID: 7519002566342004031}
- - component: {fileID: 7519002566342004024}
- m_Layer: 5
- m_Name: bg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002566342004025
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566342004026}
- 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: 8772249490176231431}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 1.9, y: 14.6}
- m_SizeDelta: {x: 109, y: 108}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002566342004031
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566342004026}
- m_CullTransparentMesh: 0
---- !u!114 &7519002566342004024
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566342004026}
- 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: 6cd430959bb0f9a458c319e681e10953, 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 &7519002566395151218
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002566395151217}
- - component: {fileID: 7519002566395151223}
- - component: {fileID: 7519002566395151216}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002566395151217
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566395151218}
- 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: 8772249490015848709}
- 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: 85.34, y: 122.7}
- m_SizeDelta: {x: 45.77, y: 3.42}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002566395151223
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566395151218}
- m_CullTransparentMesh: 0
---- !u!114 &7519002566395151216
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566395151218}
- 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: ce7b25bccdf92c54abce7f0236c39592, 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 &7519002566950850569
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002566950850568}
- - component: {fileID: 7519002566950850574}
- - component: {fileID: 7519002566950850575}
- m_Layer: 5
- m_Name: mask
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002566950850568
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566950850569}
- 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: 8772249490176231431}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 2.38, y: 14.600008}
- m_SizeDelta: {x: 97.15, y: 96.27}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002566950850574
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566950850569}
- m_CullTransparentMesh: 0
---- !u!114 &7519002566950850575
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002566950850569}
- 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: 0.7058824}
- 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: e55e2a2d87549ab4b93f51bd066b76f7, 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 &7519002567368388625
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002567368388624}
- - component: {fileID: 7519002567368388630}
- - component: {fileID: 7519002567368388631}
- 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 &7519002567368388624
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567368388625}
- 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: 8772249490015848709}
- 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: -88.05, y: 122.7}
- m_SizeDelta: {x: 48.59, y: 3.42}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002567368388630
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567368388625}
- m_CullTransparentMesh: 0
---- !u!114 &7519002567368388631
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567368388625}
- 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: ce7b25bccdf92c54abce7f0236c39592, 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 &7519002567668028826
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7519002567668028825}
- - component: {fileID: 7519002567668028831}
- - component: {fileID: 7519002567668028824}
- m_Layer: 5
- m_Name: Image (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7519002567668028825
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567668028826}
- 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: 8772249490015848709}
- 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: -88.049995, y: -21.7}
- m_SizeDelta: {x: 48.59, y: 3.42}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7519002567668028831
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567668028826}
- m_CullTransparentMesh: 0
---- !u!114 &7519002567668028824
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7519002567668028826}
- 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: ce7b25bccdf92c54abce7f0236c39592, 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 &7547485982778396939
GameObject:
m_ObjectHideFlags: 0
@@ -4044,7 +4198,7 @@ RectTransform:
m_Children:
- {fileID: 8452520646202461036}
- {fileID: 1324252508207588082}
- - {fileID: 8703410554700213547}
+ - {fileID: 3320535101665877559}
- {fileID: 7578765807345141448}
- {fileID: 4819646160805820910}
m_Father: {fileID: 8772249490727969350}
@@ -4195,7 +4349,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 6814112330040602929}
+ - {fileID: 598072556026970669}
m_Father: {fileID: 7651931840296368259}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4256,7 +4410,7 @@ RectTransform:
m_Children:
- {fileID: 6455008142783829609}
- {fileID: 4080485379286074366}
- - {fileID: 1581301990849190829}
+ - {fileID: 4840728677684029617}
m_Father: {fileID: 8772249490727969350}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4457,160 +4611,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &8682466714263031278
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6048291297600042286}
- - component: {fileID: 7462489606413466914}
- - component: {fileID: 4697898957376069562}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6048291297600042286
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8682466714263031278}
- 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: 2040217664681266899}
- 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: -3.5, y: 0.00000095367}
- m_SizeDelta: {x: 157.13, y: 65.07}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7462489606413466914
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8682466714263031278}
- m_CullTransparentMesh: 0
---- !u!114 &4697898957376069562
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8682466714263031278}
- 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: 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: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u6311 \u6218"
- LanguageIndex: 10123
---- !u!1 &8703410554700213540
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8703410554700213547}
- - component: {fileID: 8703410554700213545}
- - component: {fileID: 8703410554700213546}
- m_Layer: 5
- m_Name: mask
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8703410554700213547
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8703410554700213540}
- 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: 7651931840296368259}
- 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: -4.01, y: -23.4}
- m_SizeDelta: {x: 183.66, y: 283.49}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8703410554700213545
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8703410554700213540}
- m_CullTransparentMesh: 0
---- !u!114 &8703410554700213546
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8703410554700213540}
- 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: b03c27bdd3cdd484d980dcdd0e912311, 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 &8772249489909623989
GameObject:
m_ObjectHideFlags: 0
@@ -4642,7 +4642,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 7519002565682264849}
+ - {fileID: 4504879607366141965}
m_Father: {fileID: 9065563071265118532}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4769,10 +4769,10 @@ RectTransform:
m_Children:
- {fileID: 8772249491400833922}
- {fileID: 8772249491607625913}
- - {fileID: 7519002566395151217}
- - {fileID: 7519002567368388624}
- - {fileID: 7519002565702398366}
- - {fileID: 7519002567668028825}
+ - {fileID: 4504879608079052909}
+ - {fileID: 4504879609052267276}
+ - {fileID: 4504879607378936450}
+ - {fileID: 4504879608815052421}
m_Father: {fileID: 8772249491847288056}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4810,7 +4810,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 5902265575477399700}
+ - {fileID: 519426444444623752}
m_Father: {fileID: 8772249490176231431}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4883,9 +4883,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 7519002566342004025}
+ - {fileID: 4504879608026955301}
- {fileID: 6039098261744506345}
- - {fileID: 7519002566950850568}
+ - {fileID: 4504879608626357012}
- {fileID: 8772249490299499662}
- {fileID: 8402998006795341576}
- {fileID: 8772249490155962334}
@@ -5142,7 +5142,7 @@ RectTransform:
m_Children:
- {fileID: 8772249490571615142}
- {fileID: 8772249491387197008}
- - {fileID: 4183519265975200628}
+ - {fileID: 7841479739716687976}
m_Father: {fileID: 8772249490727969350}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index 18eb532720..cab4705e64 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -2343,7 +2343,7 @@
[12342] = "剩余购买次数:",
[12343] = "全公会成员攻击力+0%(未激活) ",
[12344] = "全公会成员攻击力+ %s ",
- [12345] = "(%s:%s:%s:后失效)",
+ [12345] = "(%s后失效)",
[12346] = "已击败【%s】!",
[12347] = "即可再抽取",
[12348] = "青龙秘宝",
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
index 55e54b2faf..a942ed6e74 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
@@ -9,6 +9,7 @@ local cutOpenIndexMonsterConFig
local itemList = {}--优化itemView使用
local sorting = 0
local curBuyIndex = 0
+local oldSelceParent
this.playerScrollHead={}--滚动条头像
--初始化组件(用于子类重写)
function GuildTranscriptMainPopup:InitComponent()
@@ -161,15 +162,10 @@ function GuildTranscriptMainPopup:BindEvent()
local second = msg.nextTime - PlayerManager.serverTime
if second <= 0 then
ChatManager.RequestSendGuildTranscript(function()
- -- PopupTipPanel.ShowTip("")
end)
+ PopupTipPanel.ShowTip("已发送集结公告!")
else
- local day = math.floor(second / (24 * 3600))
- local minute = math.floor(second / 60) % 60
- local sec = math.floor(second % 60)
- local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
- local timeStr = string.format(Language[12231], minute, sec)
- PopupTipPanel.ShowTip(string.format(Language[12335],timeStr))
+ PopupTipPanel.ShowTip(string.format(Language[12335],TimeToMS(second)))
end
end)
end)
@@ -265,11 +261,11 @@ function this.SingleChapterDataShow(go,data)
local monsterData = this.GetMonsterConfigDataById(data.MonsterId)
if not monsterData then return end
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig[monsterData.MonsterId].Icon))
- if cutOpenIndex > data.Id then--已打过
+ if GuildTranscriptManager.GetCurBoss() > data.Id then--已打过
Util.SetGray(go, true)
lock:SetActive(false)
mask:SetActive(false)
- elseif cutOpenIndex == data.Id then--已开启
+ elseif GuildTranscriptManager.GetCurBoss() == data.Id then--已开启
Util.SetGray(go, false)
lock:SetActive(false)
mask:SetActive(false)
@@ -278,8 +274,10 @@ function this.SingleChapterDataShow(go,data)
lock:SetActive(true)
mask:SetActive(true)
end
- if cutOpenIndex == data.Id then
+ if cutOpenIndex == data.Id then
this.SetSelectImagePos(go)
+ elseif oldSelceParent == go then
+ this.SelectImage:SetActive(false)
end
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
if data.Id > GuildTranscriptManager.GetCurBoss() then
@@ -360,6 +358,7 @@ function this.ShowBossInfo()
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
this.bossHerohpPassText.text = Language[12340]
+ this.bossHerohpPass.fillAmount = 0
end
local liveName = GetResourcePath(curheroConfig.Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
@@ -499,14 +498,11 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
end
end
function this.TimeStampToDateString(second)
- local day = math.floor(second / (24 * 3600))
- local minute = math.floor(second / 60) % 60
- local sec = math.floor( second % 60)
- local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
- return string.format(Language[12345],hour, minute, sec)
+ return string.format(Language[12345],TimeToHMS(second))
end
function this.SetSelectImagePos(parent)
+ oldSelceParent = parent
Util.SetGray(this.SelectImage,false)
this.SelectImage:SetActive(true)
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv
index 1b4ae5362b..5e68f61b4e 100644
--- a/data_execl/Language_data/LanguageLua.csv
+++ b/data_execl/Language_data/LanguageLua.csv
@@ -2342,7 +2342,7 @@
12342,ʣ:
12343,ȫԱ+0%(δ)
12344,ȫԱ+ %s
-12345,(%s:%s:%s:ʧЧ)
+12345,(%sʧЧ)
12346,ѻܡ%s
12347,ٳȡ
12348,ر
From a8352e16e056d796ed0ccd2e4497514ab491b079 Mon Sep 17 00:00:00 2001
From: altair <909142336@qq.com>
Date: Tue, 25 Aug 2020 18:33:29 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=B9=E6=95=88?=
=?UTF-8?q?=E9=A2=84=E8=AE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Skill/Effect_c_dhdj_00042_attack.prefab | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_dhdj_00042_attack.prefab b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_dhdj_00042_attack.prefab
index a62d1ca721..3c945f5822 100644
--- a/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_dhdj_00042_attack.prefab
+++ b/Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_dhdj_00042_attack.prefab
@@ -86352,16 +86352,16 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 4994094203524441541}
+ - component: {fileID: 5789233355107392950}
m_Layer: 0
- m_Name: c_dhdj_00042_001_02
+ m_Name: Effect_c_dhdj_00042_attack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &4994094203524441541
-Transform:
+--- !u!224 &5789233355107392950
+RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -86375,6 +86375,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3749855958173387464
GameObject:
m_ObjectHideFlags: 0
@@ -216230,7 +216235,7 @@ Transform:
- {fileID: 2727293560008165737}
- {fileID: 7494642602904554780}
- {fileID: 7781876518439619559}
- m_Father: {fileID: 4994094203524441541}
+ m_Father: {fileID: 5789233355107392950}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9008653744260767010
From 617cb53270eb72217759bf917cbd18bea276f1d6 Mon Sep 17 00:00:00 2001
From: ZhangBiao
Date: Tue, 25 Aug 2020 18:35:04 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=9B=9E=E6=98=A5?=
=?UTF-8?q?=E6=95=A3=E6=98=9F=E6=98=9F=E3=80=81=E5=8D=87=E7=BA=A7=E7=A4=BC?=
=?UTF-8?q?=E5=8C=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Popup/GeneralPopup.prefab | 2 +-
.../UpGradePackage/UpGradePackagePanel.prefab | 2 +-
.../ResConfigs/ResourcePathConfig.asset | 34 ++++++++++++++++++-
.../Modules/Operating/OperatingManager.lua | 6 ++--
4 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index 3d44c713e2..bcfed2951a 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -22368,7 +22368,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: 46.8, y: -57}
+ m_AnchoredPosition: {x: -69, y: -69}
m_SizeDelta: {x: 239.96, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4536685851633023705
diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab
index 6d568bad59..378323cbc3 100644
--- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab
@@ -43764,7 +43764,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u4EF7\u503C\uFF1A1140\u5143"
+ m_Text: "\u4EF7\u503C\uFF1A$1140"
LanguageIndex: 11732
--- !u!1 &5974049692653517533
GameObject:
diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
index 797c15e5a1..aa1f307e69 100644
--- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
+++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
@@ -2909,6 +2909,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 0
resAbNameIndex: 0
+ - resName: l_yueka_haohuayueka
+ extension: .png
+ resPathIndex: 0
+ resAbNameIndex: 0
+ - resName: l_yueka_putongyueka
+ extension: .png
+ resPathIndex: 0
+ resAbNameIndex: 0
- resName: q_qinlongmibao_anniu
extension: .png
resPathIndex: 0
@@ -3277,6 +3285,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
+ - resName: r_mrcz_zi_33
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
+ - resName: r_mrcz_zi_4
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
- resName: r_qrkh_lq
extension: .png
resPathIndex: 1
@@ -5205,10 +5221,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 32
resAbNameIndex: 15
+ - resName: s_shouchong_$1
+ extension: .png
+ resPathIndex: 32
+ resAbNameIndex: 15
- resName: s_shouchong_100
extension: .png
resPathIndex: 32
resAbNameIndex: 15
+ - resName: s_shouchong_15
+ extension: .png
+ resPathIndex: 32
+ resAbNameIndex: 15
- resName: s_shouchong_6
extension: .png
resPathIndex: 32
@@ -15465,6 +15489,10 @@ MonoBehaviour:
extension: .jpg
resPathIndex: 95
resAbNameIndex: 793
+ - resName: l_yueka_beijin2
+ extension: .jpg
+ resPathIndex: 95
+ resAbNameIndex: 793
- resName: l_yueka_beijindi
extension: .jpg
resPathIndex: 95
@@ -34421,6 +34449,10 @@ MonoBehaviour:
extension: .mat
resPathIndex: 251
resAbNameIndex: 1995
+ - resName: dajin_effect_15_lz 2
+ extension: .mat
+ resPathIndex: 251
+ resAbNameIndex: 1995
- resName: dajin_effect_16
extension: .mat
resPathIndex: 251
@@ -49580,7 +49612,6 @@ MonoBehaviour:
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/tagatlas.unity3d
- lz4/atlas/tagbuttonatlas.unity3d
- - lz4/bg/artfontbg/l_yueka_beijindi.unity3d
- lz4/bg/artfontbg/r_lianxuchongzhi_beijing.unity3d
- lz4/bg/artfontbg/r_meiriqiandaobeijing.unity3d
- lz4/bg/l_libao_beijin.unity3d
@@ -50147,6 +50178,7 @@ MonoBehaviour:
- lz4/publicartres/models.unity3d
- assetBundleName: lz4/publicartres/materials.unity3d
dependences:
+ - lz4/atlas/firstrechargeatlas.unity3d
- lz4/bg/cardmask.unity3d
- lz4/bg/cardmask2.unity3d
- lz4/publicartres/shaders.unity3d
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
index 82511a5044..11a91dee69 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
@@ -41,9 +41,9 @@ function this.SetBasicValues(giftGoodsList)
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
+ -- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
+ -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
+ -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
if giftGoodsInfoList[rechargeConfig.Type] then
From 2ea0c639992f4d1f2e53a8040ffddd51bead5237 Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Tue, 25 Aug 2020 18:39:57 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=89=AF=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
index 10f35e7d4f..4b9de495aa 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
@@ -175,7 +175,7 @@ function this.SetScroll(i)
this.scrollView:SetData(curData,function(index,root)
this.SetData(root,curData[index], curData[index - 1])
end)
- this.scrollView:SetIndex(curMaxOpenId)
+ this.scrollView:SetIndex(1)
end
--设置滚动条数据 root根节点 data本地表数据 ldata 上一条数据