Merge branch 'china/dev_bt' into china/dev_bt_develop
commit
be76933912
|
|
@ -465,10 +465,10 @@ RectTransform:
|
|||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 90, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4573983830629001742
|
||||
CanvasRenderer:
|
||||
|
|
@ -1269,10 +1269,10 @@ RectTransform:
|
|||
m_Father: {fileID: 959130899583045509}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 580, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4713829247308178245
|
||||
CanvasRenderer:
|
||||
|
|
@ -1462,10 +1462,10 @@ RectTransform:
|
|||
m_Father: {fileID: 959130899583045509}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 720, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3043128608018388249
|
||||
CanvasRenderer:
|
||||
|
|
@ -1774,7 +1774,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6489381859193902079
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3060,10 +3060,10 @@ RectTransform:
|
|||
m_Father: {fileID: 959130899583045509}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 160, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2026494486082166274
|
||||
CanvasRenderer:
|
||||
|
|
@ -3803,10 +3803,10 @@ RectTransform:
|
|||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 370, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5309317615122532976
|
||||
CanvasRenderer:
|
||||
|
|
@ -4457,7 +4457,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1441774295091081370
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4831,10 +4831,10 @@ RectTransform:
|
|||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 510, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7065973308383303497
|
||||
CanvasRenderer:
|
||||
|
|
@ -5644,6 +5644,135 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -4, y: -2}
|
||||
m_SizeDelta: {x: 142.16, y: 29.09}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1 &3883100676916676871
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3947200521355277761}
|
||||
- component: {fileID: 3247075867676614747}
|
||||
- component: {fileID: 5764525245322666280}
|
||||
- component: {fileID: 7499994960101554572}
|
||||
- component: {fileID: 4933161813004703439}
|
||||
m_Layer: 5
|
||||
m_Name: Btn6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3947200521355277761
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3883100676916676871}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9118544445856956012}
|
||||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 790, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3247075867676614747
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3883100676916676871}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5764525245322666280
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3883100676916676871}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 7499994960101554572}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &7499994960101554572
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3883100676916676871}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &4933161813004703439
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3883100676916676871}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &3891858840950690860
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6847,10 +6976,10 @@ RectTransform:
|
|||
m_Father: {fileID: 959130899583045509}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 440, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3428141315978654585
|
||||
CanvasRenderer:
|
||||
|
|
@ -7038,6 +7167,7 @@ RectTransform:
|
|||
- {fileID: 960582149146402887}
|
||||
- {fileID: 247998761836926757}
|
||||
- {fileID: 373804439091951877}
|
||||
- {fileID: 3947200521355277761}
|
||||
m_Father: {fileID: 1659596316211348610}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -9266,10 +9396,10 @@ RectTransform:
|
|||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 230, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7795520682918704533
|
||||
CanvasRenderer:
|
||||
|
|
@ -11105,10 +11235,10 @@ RectTransform:
|
|||
m_Father: {fileID: 9200963702838850311}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 650, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6460921918868668529
|
||||
CanvasRenderer:
|
||||
|
|
@ -11777,6 +11907,80 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 5/5
|
||||
--- !u!1 &7624688909849283653
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9118544445856956012}
|
||||
- component: {fileID: 7557120701204741888}
|
||||
- component: {fileID: 3078307851676093131}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9118544445856956012
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7624688909849283653}
|
||||
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: 3947200521355277761}
|
||||
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: 164, y: 164}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7557120701204741888
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7624688909849283653}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3078307851676093131
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7624688909849283653}
|
||||
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: 1fabd8cc4ea4bd6478e8a81d6b138900, 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 &7698610848893551618
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13348,10 +13552,10 @@ RectTransform:
|
|||
m_Father: {fileID: 959130899583045509}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -50}
|
||||
m_SizeDelta: {x: 60, y: 88}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5713593700809359769
|
||||
CanvasRenderer:
|
||||
|
|
@ -14804,6 +15008,18 @@ PrefabInstance:
|
|||
objectReference: {fileID: 4437600977647621456}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!4 &2935823801474064421 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2352033357466444646 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1424338125224582353 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
|
|
@ -14822,9 +15038,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &4004229281899235646 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
--- !u!4 &7126708398865004788 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -14834,12 +15050,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2352033357466444646 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &562193232071614603 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
|
|
@ -14858,6 +15068,36 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3613232194504526807 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &4004229281899235646 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6588252493083957537 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9219937486075496732 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1680770620804836921 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3592314898061774466 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
|
|
@ -14876,33 +15116,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &9219937486075496732 stripped
|
||||
--- !u!4 &8398667022943706122 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2935823801474064421 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3359955998269420578 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3613232194504526807 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1680770620804836921 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -14912,21 +15128,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6588252493083957537 stripped
|
||||
--- !u!4 &3359955998269420578 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7126708398865004788 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8398667022943706122 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1495117948262875217}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15164,27 +15368,9 @@ PrefabInstance:
|
|||
objectReference: {fileID: 108444629137817996}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!4 &5517080283118096565 stripped
|
||||
--- !u!4 &994930611963763294 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3445395248339830797 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5231718680891164886 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5358186331490748082 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15194,87 +15380,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4892896049322352064 stripped
|
||||
--- !u!4 &5358186331490748082 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &994930611963763294 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4475143494716293140 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3118611600830888677 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5284449500228568734 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4312632630686397527 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7308227165633779873 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6842063791756667944 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2977372411208928883 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1022322383968624395 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2067392625425250234 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1489257105556534521 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1347760937533792510 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7456536014493453821 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15284,12 +15392,108 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4475143494716293140 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1489257105556534521 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7456536014493453821 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5231718680891164886 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1347760937533792510 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2067392625425250234 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1022322383968624395 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6842063791756667944 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7308227165633779873 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4312632630686397527 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5284449500228568734 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &108444629137817996 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &5517080283118096565 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3118611600830888677 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2977372411208928883 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3445395248339830797 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4892896049322352064 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2930570780378322061}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4024593173043459165
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15524,129 +15728,129 @@ PrefabInstance:
|
|||
objectReference: {fileID: 2229287739125031260}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!4 &6208038782315013710 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2641585708450665607 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8799269859400054897 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4720516192376622328 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &270666847548512106 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &854461004083172393 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2229287739125031260 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &992328886815031342 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1509940222427725106 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2408203142309503172 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3762414482627664437 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6671607564786220304 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1243350260009418715 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6044354044207673445 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3504293137159563485 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6335312160677849094 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6137661543132522082 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6827396740961812180 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1351067438097267342 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3900258964432580259 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6827396740961812180 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6137661543132522082 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6335312160677849094 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &3504293137159563485 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6044354044207673445 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2229287739125031260 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1509940222427725106 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4720516192376622328 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8799269859400054897 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2641585708450665607 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6208038782315013710 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &992328886815031342 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6671607564786220304 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8650200251655482669 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1351067438097267342 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &270666847548512106 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1243350260009418715 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &854461004083172393 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2408203142309503172 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4024593173043459165}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -12074,6 +12074,7 @@ RectTransform:
|
|||
- {fileID: 4951656903778910803}
|
||||
- {fileID: 24039886129430217}
|
||||
- {fileID: 7662909153679815900}
|
||||
- {fileID: 1978414454451140457}
|
||||
m_Father: {fileID: 7322632077710086358}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -25643,6 +25644,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4306730897912597358
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8782437899002480719}
|
||||
- component: {fileID: 4612843475558593318}
|
||||
- component: {fileID: 1104336980934799351}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8782437899002480719
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4306730897912597358}
|
||||
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: 1978414454451140457}
|
||||
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: 164, y: 164}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4612843475558593318
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4306730897912597358}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1104336980934799351
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4306730897912597358}
|
||||
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: 47ce9b27346f39f45b705e95eb3984a7, 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 &4318458742089343282
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -47390,6 +47465,135 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &9078693861324090799
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1978414454451140457}
|
||||
- component: {fileID: 5340892954920088993}
|
||||
- component: {fileID: 6864730438210845384}
|
||||
- component: {fileID: 5706427354905539016}
|
||||
- component: {fileID: 9029912774793960587}
|
||||
m_Layer: 5
|
||||
m_Name: Btn6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1978414454451140457
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9078693861324090799}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8782437899002480719}
|
||||
m_Father: {fileID: 6669000462376630719}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5340892954920088993
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9078693861324090799}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6864730438210845384
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9078693861324090799}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 5706427354905539016}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &5706427354905539016
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9078693861324090799}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &9029912774793960587
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9078693861324090799}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &9084665679364385913
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@ RectTransform:
|
|||
- {fileID: 5270166641082040520}
|
||||
- {fileID: 5905118992494067694}
|
||||
- {fileID: 6226173992747795047}
|
||||
- {fileID: 1861463328926377883}
|
||||
m_Father: {fileID: 1759585470645775885}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -450,7 +451,7 @@ MonoBehaviour:
|
|||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 130, y: 130}
|
||||
m_Spacing: {x: 80, y: 0}
|
||||
m_Spacing: {x: 40, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &929006863589406078
|
||||
|
|
@ -843,6 +844,123 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2347839544094818982
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1861463328926377883}
|
||||
- component: {fileID: 762124743951436204}
|
||||
- component: {fileID: 2116558142059303973}
|
||||
- component: {fileID: 2126114635868621898}
|
||||
m_Layer: 5
|
||||
m_Name: kong
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1861463328926377883
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2347839544094818982}
|
||||
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: 8126913021008556213}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &762124743951436204
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2347839544094818982}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2116558142059303973
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2347839544094818982}
|
||||
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: 47ce9b27346f39f45b705e95eb3984a7, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &2126114635868621898
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2347839544094818982}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6712690525005789747}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &2350953257311272343
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1058,7 +1058,7 @@ RedPointType = {
|
|||
incarnation_taoist = 43805,
|
||||
tiandihonglu = 43806,
|
||||
incarnation_force = 43807,--化身之力红点
|
||||
|
||||
incarnation_Kong = 43808,
|
||||
recruitTreasure = 7010,
|
||||
recruitTreasure_one = 7011,
|
||||
recruitTreasure_two = 7012,
|
||||
|
|
|
|||
|
|
@ -1330,6 +1330,7 @@ function this.BagIndicationRefresh(msg)
|
|||
CheckRedPointStatus(RedPointType.incarnation_buddish)
|
||||
CheckRedPointStatus(RedPointType.incarnation_demon)
|
||||
CheckRedPointStatus(RedPointType.incarnation_taoist)
|
||||
CheckRedPointStatus(RedPointType.incarnation_Kong)
|
||||
end
|
||||
if v.itemId == 1351 then
|
||||
DynamicActivityManager.ChangeMingWangLv()
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ function this:InitComponent(gameObject)
|
|||
end
|
||||
for i = 1, 6 do
|
||||
tabs[i] = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/Tabs/grid/Btn" .. i)
|
||||
tabs[i]:SetActive(true)
|
||||
end
|
||||
this.selectBtn=Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/Tabs/selectBtn")
|
||||
this.heroPre = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/heroPre")
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ function this:InitComponent(gameObject)
|
|||
this.replaceBtn = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/btns/replaceBtn")
|
||||
this.saveBtn = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/btns/saveBtn")
|
||||
this.cancelBtn = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/btns/cancelBtn")
|
||||
for i = 1, 5 do
|
||||
for i = 1, 6 do
|
||||
tabs[i] = Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/Tabs/Grid/Btn" .. i)
|
||||
end
|
||||
this.selectBtn=Util.GetGameObject(gameObject, "CompoundHeroPanel_Replace/Tabs/SelectBtn")
|
||||
|
|
|
|||
|
|
@ -280,6 +280,8 @@ function this.CheckRedData(red)
|
|||
list = this.GetItemDataListByPro(2)
|
||||
elseif red == RedPointType.incarnation_demon then
|
||||
list = this.GetItemDataListByPro(3)
|
||||
elseif red == RedPointType.incarnation_Kong then
|
||||
list = this.GetItemDataListByPro(5)
|
||||
else
|
||||
list = this.GetItemDataListByPro(4)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ local curIndex=1
|
|||
local allPos={1321,327,-330}
|
||||
function IncarnationPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
for i = 1, 4 do
|
||||
for i = 1, 5 do
|
||||
tabs[i] = Util.GetGameObject(self.transform, "bg/Tabs/grid/Btn" .. i)
|
||||
tabsRedpoints[i] = Util.GetGameObject(tabs[i], "redpoint")
|
||||
if tabsImg[i] then
|
||||
|
|
@ -60,7 +60,7 @@ end
|
|||
|
||||
|
||||
function IncarnationPanel:BindEvent()
|
||||
for i = 1,4 do
|
||||
for i = 1,5 do
|
||||
Util.AddClick(tabs[i], function()
|
||||
if i == proId then
|
||||
return
|
||||
|
|
@ -142,6 +142,7 @@ function IncarnationPanel:BindEvent()
|
|||
BindRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject)
|
||||
BindRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject)
|
||||
BindRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject)
|
||||
BindRedPointObject(RedPointType.incarnation_Kong,tabsRedpoints[5].gameObject)
|
||||
BindRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject)
|
||||
end
|
||||
|
||||
|
|
@ -459,6 +460,7 @@ function IncarnationPanel:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject)
|
||||
ClearRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject)
|
||||
ClearRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject)
|
||||
ClearRedPointObject(RedPointType.incarnation_Kong,tabsRedpoints[5].gameObject)
|
||||
ClearRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject)
|
||||
SubUIManager.Close(self.UpView)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -298,6 +298,7 @@ end
|
|||
function this:OnClose()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.CommonEvent.RefreshIncarnationPanel)
|
||||
CheckRedPointStatus(RedPointType.incarnation_people)
|
||||
CheckRedPointStatus(RedPointType.incarnation_Kong)
|
||||
CheckRedPointStatus(RedPointType.incarnation_buddish)
|
||||
CheckRedPointStatus(RedPointType.incarnation_demon)
|
||||
CheckRedPointStatus(RedPointType.incarnation_taoist)
|
||||
|
|
|
|||
|
|
@ -342,6 +342,7 @@ function this.InitRedPointAllRelate()
|
|||
|
||||
--身外化身
|
||||
RPData:SetParent(RedPointType.incarnation_people,RedPointType.incarnation)
|
||||
RPData:SetParent(RedPointType.incarnation_Kong,RedPointType.incarnation)
|
||||
RPData:SetParent(RedPointType.incarnation_buddish,RedPointType.incarnation)
|
||||
RPData:SetParent(RedPointType.incarnation_demon,RedPointType.incarnation)
|
||||
RPData:SetParent(RedPointType.incarnation_taoist,RedPointType.incarnation)
|
||||
|
|
@ -668,6 +669,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.incarnation_buddish,IncarnationManager.CheckRedData)
|
||||
RPData:AddCheckFunc(RedPointType.incarnation_demon,IncarnationManager.CheckRedData)
|
||||
RPData:AddCheckFunc(RedPointType.incarnation_taoist,IncarnationManager.CheckRedData)
|
||||
RPData:AddCheckFunc(RedPointType.incarnation_Kong,IncarnationManager.CheckRedData)
|
||||
RPData:AddCheckFunc(RedPointType.incarnation_force,IncarnationManager.CheckPowerBtnRedData)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.tiandihonglu,OperatingManager.GetTianDiHongLuRedPointStatus)
|
||||
|
|
|
|||
|
|
@ -308,7 +308,6 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||
else
|
||||
changeProBtn:SetActive(false)
|
||||
LogError("+++++++")
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
end
|
||||
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ function this:InitComponent(gameObject)
|
|||
this.des2=Util.GetGameObject(gameObject,"new/des2"):GetComponent("Text")
|
||||
this.hint=Util.GetGameObject(gameObject,"new/hint"):GetComponent("Text")
|
||||
this.btnList = {}
|
||||
for i = 1, 5 do
|
||||
for i = 1, 6 do
|
||||
this.btnList[i] = Util.GetGameObject(this.selectBar,"Btn"..i)
|
||||
end
|
||||
for index, config in ConfigPairs(hotRankConfig) do
|
||||
|
|
@ -93,7 +93,7 @@ end
|
|||
function this:BindEvent()
|
||||
-- LogError("1111111111111111")
|
||||
|
||||
for i = 1, 5 do
|
||||
for i = 1, 6 do
|
||||
Util.AddClick(this.btnList[i],function()
|
||||
if curPage ~= i then
|
||||
this:Refresh(i)
|
||||
|
|
|
|||
|
|
@ -155,29 +155,31 @@ function RewardBoxPanel:SetGiftData()--设置奖励列表
|
|||
end
|
||||
|
||||
local dataList = {}
|
||||
local showItems = rewardGroup[RewardGroupList[tagNum]].ShowItem
|
||||
for _, item in ipairs(showItems) do
|
||||
local itemType = itemConfig[item[1]].ItemType
|
||||
if itemType == ItemType.Hero then
|
||||
-- 判断是否在版本内
|
||||
if HeroManager.InVersion(item[1]) then
|
||||
if RewardGroupList[tagNum] then
|
||||
local showItems = rewardGroup[RewardGroupList[tagNum]].ShowItem
|
||||
for _, item in ipairs(showItems) do
|
||||
local itemType = itemConfig[item[1]].ItemType
|
||||
if itemType == ItemType.Hero then
|
||||
-- 判断是否在版本内
|
||||
if HeroManager.InVersion(item[1]) then
|
||||
table.insert(dataList, item)
|
||||
end
|
||||
elseif itemType == ItemType.HeroDebris then
|
||||
-- 判断是否在版本内
|
||||
local heroId = HeroManager.ChipIdToHeroId(item[1])
|
||||
--if not heroId or HeroManager.InVersion(heroId) then
|
||||
table.insert(dataList, item)
|
||||
--end
|
||||
else
|
||||
table.insert(dataList, item)
|
||||
end
|
||||
elseif itemType == ItemType.HeroDebris then
|
||||
-- 判断是否在版本内
|
||||
local heroId = HeroManager.ChipIdToHeroId(item[1])
|
||||
--if not heroId or HeroManager.InVersion(heroId) then
|
||||
table.insert(dataList, item)
|
||||
--end
|
||||
else
|
||||
table.insert(dataList, item)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
itemType = itemConfig[dataList[1][1]].ItemType
|
||||
for _, data in ipairs(dataList) do
|
||||
LogRed(data[1])
|
||||
|
||||
|
||||
itemType = itemConfig[dataList[1][1]].ItemType
|
||||
for _, data in ipairs(dataList) do
|
||||
LogRed(data[1])
|
||||
end
|
||||
end
|
||||
this.ScrollView:SetData(dataList,function(index,item)
|
||||
RewardBoxPanel:SetSingleGiftData(index,item,dataList)
|
||||
|
|
@ -185,6 +187,7 @@ function RewardBoxPanel:SetGiftData()--设置奖励列表
|
|||
if #dataList>4 then
|
||||
this.ScrollView:SetDragGoRect(Vector2.New(0,120))
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
--刷新每一条奖励信息
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ function RoleChooseListPanel:BindEvent()
|
|||
HarmonyManager:SetGongMingList(TempData.dynamicId)
|
||||
if HarmonyManager.equipCount == 24 then
|
||||
--LogGreen("脱装备")
|
||||
for i = 1, #TempData.equipIdList do
|
||||
HeroManager.SetHeroEquipIdList(TempData.dynamicId, {})
|
||||
EquipManager.DeleteSingleEquip(TempData.equipIdList[i],TempData.dynamicId)
|
||||
end
|
||||
-- for i = 1, #TempData.equipIdList do
|
||||
-- HeroManager.SetHeroEquipIdList(TempData.dynamicId, {})
|
||||
-- EquipManager.DeleteSingleEquip(TempData.equipIdList[i],TempData.dynamicId)
|
||||
-- end
|
||||
end
|
||||
NetManager.SendGongMingBox(TempData.dynamicId,HarmonyManager.GongMingBox,1,function (msg)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.ChooseData,TempData)
|
||||
|
|
|
|||
Loading…
Reference in New Issue