Compare commits
No commits in common. "7ea22e0f05daf6bb49d2675938db6006c133133d" and "b6df50df92be85e520bc40653795fb9d937e9bf2" have entirely different histories.
7ea22e0f05
...
b6df50df92
@ -400,90 +400,6 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &565962927355976499
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2488875995222938941}
|
||||
- component: {fileID: 7265739179438804156}
|
||||
- component: {fileID: 3843235397591578456}
|
||||
m_Layer: 0
|
||||
m_Name: English
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2488875995222938941
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 565962927355976499}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7981879368615679320}
|
||||
m_Father: {fileID: 759228678538889935}
|
||||
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: 285.7143, y: 0}
|
||||
m_Pivot: {x: -0.00000013131648, y: 1.0000001}
|
||||
--- !u!114 &7265739179438804156
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 565962927355976499}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &3843235397591578456
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 565962927355976499}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 1
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &828211735444283824
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -758,9 +674,9 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8391117649223823481}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 45.3925, y: -12}
|
||||
m_SizeDelta: {x: 23.595, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5083076010271047650
|
||||
@ -969,10 +885,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 683708360215293002}
|
||||
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: 0, y: -10}
|
||||
m_SizeDelta: {x: 0, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5301118011458687740
|
||||
MonoBehaviour:
|
||||
@ -1029,8 +945,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_MinWidth: 10
|
||||
m_MinHeight: 20
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
@ -1279,9 +1195,9 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8391117649223823481}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 11.7975, y: -12}
|
||||
m_SizeDelta: {x: 23.595, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1150501305223535458
|
||||
@ -2633,6 +2549,7 @@ GameObject:
|
||||
- component: {fileID: 4656773611662164356}
|
||||
- component: {fileID: 2175111693853719431}
|
||||
- component: {fileID: 8314907644925150971}
|
||||
- component: {fileID: 96869165449857169}
|
||||
m_Layer: 0
|
||||
m_Name: EnglishName
|
||||
m_TagString: Untagged
|
||||
@ -2652,13 +2569,13 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2488875995222938941}
|
||||
m_Father: {fileID: 155804131736493909}
|
||||
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, y: 1.0000014}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.9545}
|
||||
m_SizeDelta: {x: 0, y: 22.327}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4656773611662164356
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2687,7 +2604,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text:
|
||||
m_text: adbcdfsdfds
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||
@ -2721,8 +2638,8 @@ MonoBehaviour:
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 8192
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -2730,7 +2647,7 @@ MonoBehaviour:
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_enableWordWrapping: 0
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
@ -2772,6 +2689,20 @@ MonoBehaviour:
|
||||
CustomComponentName: PartName
|
||||
CustomComment:
|
||||
mComponentName: TMPro.TextMeshProUGUI
|
||||
--- !u!114 &96869165449857169
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5372680377939926057}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &5616377736087547949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2925,7 +2856,6 @@ GameObject:
|
||||
- component: {fileID: 4459085572747613946}
|
||||
- component: {fileID: 4894733014413346296}
|
||||
- component: {fileID: 521060644256314275}
|
||||
- component: {fileID: 8894686537104306955}
|
||||
m_Layer: 0
|
||||
m_Name: ShowTip
|
||||
m_TagString: Untagged
|
||||
@ -2946,12 +2876,12 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6527817913563806369}
|
||||
m_Father: {fileID: 759228678538889935}
|
||||
m_Father: {fileID: 155804131736493909}
|
||||
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: 44.740295, y: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -30.8, y: -46.8}
|
||||
m_SizeDelta: {x: 44.740295, y: 25.4561}
|
||||
m_Pivot: {x: 0.0000000037252903, y: 0.5}
|
||||
--- !u!114 &4894733014413346296
|
||||
MonoBehaviour:
|
||||
@ -3017,26 +2947,6 @@ MonoBehaviour:
|
||||
CustomComponentName: ShowTip
|
||||
CustomComment:
|
||||
mComponentName: UnityEngine.UI.Toggle
|
||||
--- !u!114 &8894686537104306955
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6062610140246671523}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &6219518439359118372
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3205,10 +3115,10 @@ RectTransform:
|
||||
- {fileID: 1956754451667365408}
|
||||
m_Father: {fileID: 8633842398434044872}
|
||||
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: 164.5, y: -22}
|
||||
m_SizeDelta: {x: 309, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2974486455411436671
|
||||
MonoBehaviour:
|
||||
@ -3369,8 +3279,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 32.504997, y: 107.39996}
|
||||
m_SizeDelta: {x: 35.01, y: 19.61}
|
||||
m_AnchoredPosition: {x: 32.504997, y: 112.60986}
|
||||
m_SizeDelta: {x: 35.01, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &8371822126990485976
|
||||
CanvasRenderer:
|
||||
@ -3604,10 +3514,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8633842398434044872}
|
||||
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: 9.999884, y: -5}
|
||||
m_SizeDelta: {x: 309, y: 0}
|
||||
m_Pivot: {x: -0.00000035762787, y: 0.9999998}
|
||||
--- !u!222 &7517546175823580742
|
||||
CanvasRenderer:
|
||||
@ -3757,10 +3667,10 @@ RectTransform:
|
||||
- {fileID: 8391117649223823481}
|
||||
m_Father: {fileID: 683708360215293002}
|
||||
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: 159.5, y: -39.5}
|
||||
m_SizeDelta: {x: 319, y: 39}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2694407354443588154
|
||||
MonoBehaviour:
|
||||
@ -4017,7 +3927,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &683708360215293002
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4034,10 +3944,10 @@ RectTransform:
|
||||
- {fileID: 8633842398434044872}
|
||||
m_Father: {fileID: 7693151069151688728}
|
||||
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: 15, y: -60}
|
||||
m_SizeDelta: {x: 319, y: 66}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &504216954137080686
|
||||
MonoBehaviour:
|
||||
@ -4119,7 +4029,9 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9173910592677138117}
|
||||
- {fileID: 7981879368615679320}
|
||||
- {fileID: 8408157997413573154}
|
||||
- {fileID: 4459085572747613946}
|
||||
m_Father: {fileID: 7693151069151688728}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -4141,97 +4053,12 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 30
|
||||
m_MinHeight: 60
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &8039806695866159098
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 759228678538889935}
|
||||
- component: {fileID: 1584537668168248385}
|
||||
- component: {fileID: 6160535183075925944}
|
||||
m_Layer: 0
|
||||
m_Name: Content1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &759228678538889935
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8039806695866159098}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2488875995222938941}
|
||||
- {fileID: 4459085572747613946}
|
||||
m_Father: {fileID: 7693151069151688728}
|
||||
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, y: 1.0000002}
|
||||
--- !u!114 &1584537668168248385
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8039806695866159098}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &6160535183075925944
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8039806695866159098}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 1
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &8138444107200053018
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4266,8 +4093,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 17.505, y: -9.805}
|
||||
m_SizeDelta: {x: 35.01, y: 19.61}
|
||||
m_AnchoredPosition: {x: 17.505, y: -10}
|
||||
m_SizeDelta: {x: 35.01, y: 19.58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1941232802810836953
|
||||
CanvasRenderer:
|
||||
@ -5160,7 +4987,6 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 155804131736493909}
|
||||
- {fileID: 759228678538889935}
|
||||
- {fileID: 683708360215293002}
|
||||
- {fileID: 6745244414475164830}
|
||||
m_Father: {fileID: 6827284989092321893}
|
||||
@ -5242,7 +5068,7 @@ MonoBehaviour:
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 5
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 1
|
||||
|
||||
@ -167,6 +167,7 @@ GameObject:
|
||||
- component: {fileID: 7782795181188344123}
|
||||
- component: {fileID: 5862467672821994261}
|
||||
- component: {fileID: 6155718123906083107}
|
||||
- component: {fileID: 1595973955772534620}
|
||||
m_Layer: 0
|
||||
m_Name: Obj
|
||||
m_TagString: Untagged
|
||||
@ -188,13 +189,13 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 5503371958645181754}
|
||||
- {fileID: 297402643342089262}
|
||||
m_Father: {fileID: 869141664238722769}
|
||||
m_Father: {fileID: 8210640918603572963}
|
||||
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: -8, y: 8}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 8, y: -20.5}
|
||||
m_SizeDelta: {x: 16, y: 16}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &7782795181188344123
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -277,6 +278,26 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1595973955772534620
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 949679463227284732}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &2722814839769229341
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -352,69 +373,6 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &3229148716638904954
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6161269781192160508}
|
||||
- component: {fileID: 8739180356652880207}
|
||||
m_Layer: 0
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6161269781192160508
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3229148716638904954}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5340268679892522978}
|
||||
m_Father: {fileID: 8210640918603572963}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 19.000092, y: -0.00008773804}
|
||||
m_SizeDelta: {x: 214.8368, y: 44.81}
|
||||
m_Pivot: {x: 0.00000042654574, y: 0.99999803}
|
||||
--- !u!114 &8739180356652880207
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3229148716638904954}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 1
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &3696962679846350525
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -894,13 +852,13 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6161269781192160508}
|
||||
m_Father: {fileID: 8210640918603572963}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -0.00012198532, y: -0.0000019073486}
|
||||
m_SizeDelta: {x: 214.8368, y: 44.81}
|
||||
m_Pivot: {x: -0.00000039022416, y: 1.0000007}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -3.605301, y: -0.5}
|
||||
m_SizeDelta: {x: -28.1053, y: 25}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &2434280737762913979
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -929,7 +887,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 123123123123123123123123123213123123123123123
|
||||
m_text: "\u76AE\u80A4111111111111111111111111111111111111111111111111111111111111111111"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||
m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
|
||||
@ -964,7 +922,7 @@ MonoBehaviour:
|
||||
m_fontSizeMax: 16
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 8192
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
@ -1083,7 +1041,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 3302820038101660824}
|
||||
- component: {fileID: 7785875655137380336}
|
||||
- component: {fileID: 5638211048947461519}
|
||||
m_Layer: 0
|
||||
m_Name: UI
|
||||
m_TagString: Untagged
|
||||
@ -1110,7 +1067,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 248.8368, y: -12.500002}
|
||||
m_AnchoredPosition: {x: 253.8368, y: -12.500002}
|
||||
m_SizeDelta: {x: 30, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.49999994}
|
||||
--- !u!114 &7785875655137380336
|
||||
@ -1161,26 +1118,6 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_IsOn: 0
|
||||
--- !u!114 &5638211048947461519
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5354740506987416701}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &5527031013352946919
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1190,7 +1127,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8210640918603572963}
|
||||
- component: {fileID: 7724077135976009204}
|
||||
- component: {fileID: 5010247039725686606}
|
||||
m_Layer: 0
|
||||
m_Name: Toggle
|
||||
m_TagString: Untagged
|
||||
@ -1210,16 +1147,16 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 869141664238722769}
|
||||
- {fileID: 6161269781192160508}
|
||||
- {fileID: 2319620796387874098}
|
||||
- {fileID: 5340268679892522978}
|
||||
m_Father: {fileID: 5541132694514040108}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 233.83678, y: -22.405}
|
||||
m_SizeDelta: {x: 233.8368, y: 44.81}
|
||||
m_AnchoredPosition: {x: 238.83678, y: -12.5}
|
||||
m_SizeDelta: {x: 233.8368, y: 25}
|
||||
m_Pivot: {x: 0.9999999, y: 0.5}
|
||||
--- !u!114 &7724077135976009204
|
||||
--- !u!114 &5010247039725686606
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1228,23 +1165,17 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 5527031013352946919}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 3
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 1
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &5622793159502486285
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1547,7 +1478,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 150, y: -44.81}
|
||||
m_AnchoredPosition: {x: 150, y: -25}
|
||||
m_SizeDelta: {x: 270, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.9999995}
|
||||
--- !u!114 &3637385189413055796
|
||||
@ -1611,8 +1542,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 248.83678, y: -22.405}
|
||||
m_SizeDelta: {x: 233.8368, y: 44.81}
|
||||
m_AnchoredPosition: {x: 248.83678, y: -12.5}
|
||||
m_SizeDelta: {x: 233.8368, y: 25}
|
||||
m_Pivot: {x: 0.9999999, y: 0.5}
|
||||
--- !u!114 &1686771592827446806
|
||||
MonoBehaviour:
|
||||
@ -1627,16 +1558,16 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Left: 5
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_ChildAlignment: 3
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 1
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
@ -2432,6 +2363,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 5301813403424701298}
|
||||
- component: {fileID: 73924022181984927}
|
||||
- component: {fileID: 4349214342391091145}
|
||||
- component: {fileID: 7625664175940521788}
|
||||
m_Layer: 0
|
||||
m_Name: Item
|
||||
@ -2458,8 +2390,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 840.2999, y: 247.30215}
|
||||
m_SizeDelta: {x: 290, y: 44.81}
|
||||
m_AnchoredPosition: {x: 840.2999, y: 257.20715}
|
||||
m_SizeDelta: {x: 290, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &73924022181984927
|
||||
MonoBehaviour:
|
||||
@ -2477,6 +2409,26 @@ MonoBehaviour:
|
||||
CustomComponentName: Item
|
||||
CustomComment:
|
||||
mComponentName: RectTransform
|
||||
--- !u!114 &4349214342391091145
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8135230732746195150}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: 25
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &7625664175940521788
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2690,7 +2642,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
MarkType: 0
|
||||
CustomComponentName: RootContent
|
||||
CustomComponentName:
|
||||
CustomComment:
|
||||
mComponentName: RectTransform
|
||||
--- !u!1 &8280112074671649668
|
||||
@ -2756,63 +2708,6 @@ MonoBehaviour:
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &8315079446778039139
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 869141664238722769}
|
||||
- component: {fileID: 7272137753141780079}
|
||||
m_Layer: 0
|
||||
m_Name: ObjContent
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &869141664238722769
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8315079446778039139}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2319620796387874098}
|
||||
m_Father: {fileID: 8210640918603572963}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 9.091797, y: -0.000011444092}
|
||||
m_SizeDelta: {x: 16, y: 25}
|
||||
m_Pivot: {x: 0.5682373, y: 0.9999995}
|
||||
--- !u!114 &7272137753141780079
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8315079446778039139}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: 16
|
||||
m_MinHeight: 25
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &8631974697840578735
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -19,7 +19,7 @@ public class Body3DController : MonoSingleton<Body3DController>
|
||||
|
||||
Body3DController() { }
|
||||
|
||||
Dictionary<GameObject, Body3DObjItem> objs = new Dictionary<GameObject, Body3DObjItem>();
|
||||
Dictionary<GameObject, Body3DOjbItem> objs = new Dictionary<GameObject, Body3DOjbItem>();
|
||||
|
||||
bool selectIsGroup = false;
|
||||
|
||||
@ -59,7 +59,7 @@ public class Body3DController : MonoSingleton<Body3DController>
|
||||
isOnList.Add(selected.obj);
|
||||
|
||||
UIBody3DInfoData data = new UIBody3DInfoData();
|
||||
data.body = selected.obj.GetComponent<Body3DObjItem>().body;
|
||||
data.body = selected.obj.GetComponent<Body3DOjbItem>().body;
|
||||
UIKit.OpenPanelAsync<UIBody3DInfo>(UILevel.PopUI, data).ToAction().Start(this);
|
||||
}
|
||||
}
|
||||
@ -217,7 +217,7 @@ public class Body3DController : MonoSingleton<Body3DController>
|
||||
else
|
||||
{
|
||||
GameObject obj = Utility.FindObj(body.Path);
|
||||
var bodyObjItem = obj.GetOrAddComponent<Body3DObjItem>();
|
||||
var bodyObjItem = obj.GetOrAddComponent<Body3DOjbItem>();
|
||||
bodyObjItem.Init(body);
|
||||
objs.Add(obj, bodyObjItem);
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ using UnityEditor;
|
||||
using UnityEngine;
|
||||
using XMLTool;
|
||||
|
||||
public class Body3DObjItem : MonoBehaviour
|
||||
public class Body3DOjbItem : MonoBehaviour
|
||||
{
|
||||
public Body3D.Body body;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b976f9a5699908b4895a6e33849930f3
|
||||
guid: 297f30dc51736414695fa9fd6ad43dd6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -18,7 +18,6 @@ public class ObjectColorToggle : MonoBehaviour
|
||||
private void Awake()
|
||||
{
|
||||
mesh = gameObject.GetComponent<MeshRenderer>();
|
||||
isOffColor = mesh.material.color;
|
||||
}
|
||||
|
||||
public void SetColor(State state)
|
||||
|
||||
@ -442,7 +442,11 @@ namespace QFramework.Example
|
||||
foreach (var list in bodyList)
|
||||
{
|
||||
var body = list.Value;
|
||||
Utility.FindObj(body.Path)?.SetActive(true);
|
||||
//var add = GameObject.Instantiate(BodyBtn.gameObject, BodyList);
|
||||
//var sub = GameObject.Instantiate(BodyBtn.gameObject, BodyList);
|
||||
//add.transform.Find("Label").GetComponent<TextMeshProUGUI>().text = body.Name + "+";
|
||||
//sub.transform.Find("Label").GetComponent<TextMeshProUGUI>().text = body.Name + "-";
|
||||
//sub.name = add.name = body.Name;
|
||||
bodyListIndex.Add(body.Name, new BodyListItem() { index = 0, root = body });
|
||||
bodyListIndex[body.Name].bodys.Clear();
|
||||
foreach (var subList in body.subBody)
|
||||
|
||||
@ -258,8 +258,8 @@ namespace QFramework.Example
|
||||
toggleObj.name = body.Name;
|
||||
|
||||
Toggle uiToggle = toggleObj.transform.Find("Content/UI").GetComponent<Toggle>();
|
||||
Button objBtn = toggleObj.transform.Find("Content/Toggle/ObjContent/Obj").GetComponent<Button>();
|
||||
TextMeshProUGUI label = toggleObj.transform.Find("Content/Toggle/Content/Label").GetComponentInChildren<TextMeshProUGUI>();
|
||||
Button objBtn = toggleObj.transform.Find("Content/Toggle/Obj").GetComponent<Button>();
|
||||
TextMeshProUGUI label = toggleObj.transform.Find("Content/Toggle/Label").GetComponentInChildren<TextMeshProUGUI>();
|
||||
|
||||
label.text = body.Name;
|
||||
var size = toggleObj.transform.Find("Content/Toggle").GetComponent<RectTransform>().sizeDelta;
|
||||
@ -314,7 +314,7 @@ namespace QFramework.Example
|
||||
if (subContent.childCount > index)
|
||||
{
|
||||
Transform childToggleObj = subContent.GetChild(index);
|
||||
Toggle childObjToggle = childToggleObj.transform.Find("Content/Toggle/ObjContent/Obj").GetComponent<Toggle>();
|
||||
Toggle childObjToggle = childToggleObj.transform.Find("Content/Toggle/Obj").GetComponent<Toggle>();
|
||||
childObjToggle.isOn = isOn;
|
||||
Transform childSubContent = childToggleObj.transform.Find("SubContent");
|
||||
SetSubObjActive(subBody, isOn, childSubContent);
|
||||
@ -337,7 +337,7 @@ namespace QFramework.Example
|
||||
for (int i = 0; i < parent.childCount; i++)
|
||||
{
|
||||
Transform child = parent.GetChild(i);
|
||||
Transform labelTransform = child.Find("Content/Toggle/Content/Label");
|
||||
Transform labelTransform = child.Find("Content/Toggle/Label");
|
||||
if (labelTransform != null)
|
||||
{
|
||||
TextMeshProUGUI textComponent = labelTransform.GetComponent<TextMeshProUGUI>();
|
||||
@ -352,7 +352,7 @@ namespace QFramework.Example
|
||||
Button btn = clone.transform.Find("Button").GetComponent<Button>();
|
||||
btn.onClick.AddListener(() =>
|
||||
{
|
||||
child.Find("Content/Toggle/ObjContent/Obj").GetComponent<Button>().onClick.Invoke();
|
||||
child.Find("Content/Toggle/Obj").GetComponent<Button>().onClick.Invoke();
|
||||
});
|
||||
|
||||
string grou = string.Empty;
|
||||
|
||||
@ -23,7 +23,7 @@ namespace QFramework.Example
|
||||
{
|
||||
if (currentHitObject != null)
|
||||
{
|
||||
var item = currentHitObject.GetComponent<Body3DObjItem>();
|
||||
var item = currentHitObject.GetComponent<Body3DOjbItem>();
|
||||
if (item != null)
|
||||
{
|
||||
item.objToggle.OnValueChanged.Invoke(!item.objToggle.isOn);
|
||||
@ -102,7 +102,7 @@ namespace QFramework.Example
|
||||
{
|
||||
if (obj != null)
|
||||
{
|
||||
var bodyItem = currentHitObject.GetComponent<Body3DObjItem>();
|
||||
var bodyItem = currentHitObject.GetComponent<Body3DOjbItem>();
|
||||
if (bodyItem != null)
|
||||
{
|
||||
BodyName.text = bodyItem.body.Name;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user