Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
e46d735134
|
@ -643,7 +643,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4408826367995821685
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1707,7 +1707,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 458.5, y: -0.000020025258}
|
||||
m_SizeDelta: {x: 850.1, y: 0}
|
||||
m_SizeDelta: {x: 850.1, y: 38}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &5193339339344367836
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -2391,8 +2391,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 191.66986}
|
||||
m_SizeDelta: {x: 850.1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 199.29085}
|
||||
m_SizeDelta: {x: 850.1, y: 38}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &7862881715742596568
|
||||
CanvasRenderer:
|
||||
|
@ -9216,7 +9216,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4944397495160175821
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -146,7 +146,7 @@ RectTransform:
|
|||
- {fileID: 7761828141466992623}
|
||||
- {fileID: 6329291696078814348}
|
||||
- {fileID: 2679086765222646236}
|
||||
- {fileID: 7664187428545557434}
|
||||
- {fileID: 5112065382213505902}
|
||||
m_Father: {fileID: 7816124763777208762}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -1432,7 +1432,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 20.4, y: 55.5}
|
||||
m_AnchoredPosition: {x: -0.000024796, y: 55.5}
|
||||
m_SizeDelta: {x: 373.47, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3495672692266321227
|
||||
|
@ -7276,6 +7276,8 @@ GameObject:
|
|||
- component: {fileID: 685019387835848935}
|
||||
- component: {fileID: 4696085368768755082}
|
||||
- component: {fileID: 8546267611569920985}
|
||||
- component: {fileID: 1725722361191550838}
|
||||
- component: {fileID: 427896315362366497}
|
||||
m_Layer: 5
|
||||
m_Name: Image (7)
|
||||
m_TagString: Untagged
|
||||
|
@ -7300,9 +7302,9 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 298.2, y: -467.19998}
|
||||
m_SizeDelta: {x: 214, y: 115}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 212, y: -543}
|
||||
m_SizeDelta: {x: 214, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &4696085368768755082
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7332,7 +7334,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: cc769968502bdcc4abbc1a7f789bfb2e, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
@ -7340,81 +7342,43 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1838210199014983916
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7664187428545557434}
|
||||
- component: {fileID: 5539600258787632997}
|
||||
- component: {fileID: 804597817653203751}
|
||||
m_Layer: 5
|
||||
m_Name: Image (7)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7664187428545557434
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1838210199014983916}
|
||||
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: 642913677734553132}
|
||||
m_Father: {fileID: 1792764959241262439}
|
||||
m_RootOrder: 7
|
||||
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: 333.28, y: -686.32}
|
||||
m_SizeDelta: {x: 214, y: 115}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5539600258787632997
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1838210199014983916}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &804597817653203751
|
||||
--- !u!114 &1725722361191550838
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1838210199014983916}
|
||||
m_GameObject: {fileID: 1826445925065491406}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 1741964061, 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: cc769968502bdcc4abbc1a7f789bfb2e, 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
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &427896315362366497
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1826445925065491406}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 10
|
||||
m_Right: 0
|
||||
m_Top: 15
|
||||
m_Bottom: 20
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &1924474243311888352
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8716,6 +8680,120 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2546619773329989761}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &2584452749605731904
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5112065382213505902}
|
||||
- component: {fileID: 1938921601790473743}
|
||||
- component: {fileID: 4725553174888468972}
|
||||
- component: {fileID: 951608074205423655}
|
||||
- component: {fileID: 672633008493064671}
|
||||
m_Layer: 5
|
||||
m_Name: Image (7)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5112065382213505902
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2584452749605731904}
|
||||
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: 8012878090486092443}
|
||||
m_Father: {fileID: 1792764959241262439}
|
||||
m_RootOrder: 7
|
||||
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: 343, y: -626.4}
|
||||
m_SizeDelta: {x: 214, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &1938921601790473743
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2584452749605731904}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4725553174888468972
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2584452749605731904}
|
||||
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: cc769968502bdcc4abbc1a7f789bfb2e, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &951608074205423655
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2584452749605731904}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &672633008493064671
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2584452749605731904}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 10
|
||||
m_Right: 0
|
||||
m_Top: 15
|
||||
m_Bottom: 20
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &2625038209444829079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -10383,7 +10461,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -6.81, y: 1.6082}
|
||||
m_SizeDelta: {x: 318.22, y: 108.81}
|
||||
m_SizeDelta: {x: 375.9, y: 108.81}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2379635923830656840
|
||||
CanvasRenderer:
|
||||
|
@ -10985,7 +11063,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 12.066, y: 8.63}
|
||||
m_SizeDelta: {x: 310.4, y: 89.13}
|
||||
m_SizeDelta: {x: 375.9, y: 89.13}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3482187065327472486
|
||||
CanvasRenderer:
|
||||
|
@ -15500,86 +15578,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6810306689600260360
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 642913677734553132}
|
||||
- component: {fileID: 8238563323250678802}
|
||||
- component: {fileID: 7091272389795370848}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &642913677734553132
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6810306689600260360}
|
||||
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: 7664187428545557434}
|
||||
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.25, y: 6.42}
|
||||
m_SizeDelta: {x: 190.28, y: 83.62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8238563323250678802
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6810306689600260360}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7091272389795370848
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6810306689600260360}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98039216, g: 0.8745098, b: 0.6039216, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 0.65
|
||||
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6825181381238575563
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -16173,6 +16171,101 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7216405392029624203
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8012878090486092443}
|
||||
- component: {fileID: 1806995186318467034}
|
||||
- component: {fileID: 4264058050882329600}
|
||||
- component: {fileID: 1445485466407554187}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8012878090486092443
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7216405392029624203}
|
||||
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: 5112065382213505902}
|
||||
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: 105.15, y: 0}
|
||||
m_SizeDelta: {x: 190.3, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1806995186318467034
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7216405392029624203}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4264058050882329600
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7216405392029624203}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98039216, g: 0.8745098, b: 0.6039216, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &1445485466407554187
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7216405392029624203}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &7261312105771930065
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -22938,6 +23031,7 @@ GameObject:
|
|||
- component: {fileID: 9122324941638141533}
|
||||
- component: {fileID: 1527602553848073900}
|
||||
- component: {fileID: 3150230856880877435}
|
||||
- component: {fileID: 384903824447124190}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -22959,10 +23053,10 @@ RectTransform:
|
|||
m_Father: {fileID: 685019387835848935}
|
||||
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.25, y: 4.47}
|
||||
m_SizeDelta: {x: 190.28, y: 83.62}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 105.15, y: 0}
|
||||
m_SizeDelta: {x: 190.3, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1527602553848073900
|
||||
CanvasRenderer:
|
||||
|
@ -22997,8 +23091,8 @@ MonoBehaviour:
|
|||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
@ -23007,6 +23101,20 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &384903824447124190
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8793478235579350536}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &8865634440206394105
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -703,6 +703,120 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &805760537613137974
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1077569730892415883}
|
||||
- component: {fileID: 8703585097238719343}
|
||||
- component: {fileID: 7335082084839323490}
|
||||
- component: {fileID: 2527329555118399625}
|
||||
- component: {fileID: 3840113136587941281}
|
||||
m_Layer: 5
|
||||
m_Name: di2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1077569730892415883
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 805760537613137974}
|
||||
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: 8858661580248806551}
|
||||
m_Father: {fileID: 4278237480177238713}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 311, y: -18.100006}
|
||||
m_SizeDelta: {x: 214, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &8703585097238719343
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 805760537613137974}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7335082084839323490
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 805760537613137974}
|
||||
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: cc769968502bdcc4abbc1a7f789bfb2e, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &2527329555118399625
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 805760537613137974}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &3840113136587941281
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 805760537613137974}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 10
|
||||
m_Right: 0
|
||||
m_Top: 15
|
||||
m_Bottom: 20
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &810336980727155416
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1846,86 +1960,6 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &1452232255780373624
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8246737297430810296}
|
||||
- component: {fileID: 376397558624313681}
|
||||
- component: {fileID: 1361748960864878786}
|
||||
m_Layer: 0
|
||||
m_Name: time
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8246737297430810296
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1452232255780373624}
|
||||
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: 572812122313656226}
|
||||
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: 2.45, y: 4.6}
|
||||
m_SizeDelta: {x: 200, y: 73.44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &376397558624313681
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1452232255780373624}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1361748960864878786
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1452232255780373624}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9803922, g: 0.8745099, b: 0.6039216, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "30\u6B21\u5185\u5FC5\u5F97\u91D1\u8272\u53CA\u4EE5\u4E0A\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1541829325864718262
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2006,81 +2040,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "5\u884CUP"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1556245678349438994
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 572812122313656226}
|
||||
- component: {fileID: 6476233802026640421}
|
||||
- component: {fileID: 2415067422298305564}
|
||||
m_Layer: 5
|
||||
m_Name: di2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &572812122313656226
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1556245678349438994}
|
||||
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: 8246737297430810296}
|
||||
m_Father: {fileID: 4278237480177238713}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 319, y: 34.4}
|
||||
m_SizeDelta: {x: 230, y: 115}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6476233802026640421
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1556245678349438994}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2415067422298305564
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1556245678349438994}
|
||||
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: cc769968502bdcc4abbc1a7f789bfb2e, 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 &1680382312294591109
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2390,7 +2349,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -63.7, y: -77}
|
||||
m_AnchoredPosition: {x: -72, y: -86}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1626503262693759488
|
||||
|
@ -2996,7 +2955,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2634665790303701291}
|
||||
- {fileID: 572812122313656226}
|
||||
- {fileID: 1077569730892415883}
|
||||
m_Father: {fileID: 4467816246437038445}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -3697,7 +3656,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -275.63, y: 82.09}
|
||||
m_SizeDelta: {x: 320.23, y: 109.77}
|
||||
m_SizeDelta: {x: 415.05, y: 109.77}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2143580825941473824
|
||||
CanvasRenderer:
|
||||
|
@ -4859,7 +4818,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 9, y: -29.7}
|
||||
m_AnchoredPosition: {x: 9, y: -33}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2454217108830559994
|
||||
|
@ -5437,7 +5396,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.9, y: 1}
|
||||
m_SizeDelta: {x: 574, y: 170}
|
||||
m_SizeDelta: {x: 662.6, y: 188.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7706748486574736307
|
||||
CanvasRenderer:
|
||||
|
@ -7649,8 +7608,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 149, y: -1}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_AnchoredPosition: {x: 187.05, y: -1}
|
||||
m_SizeDelta: {x: 177.79, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6683108616488038909
|
||||
CanvasRenderer:
|
||||
|
@ -7684,13 +7643,13 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_MaxSize: 30
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "29\u592912\u5C0F\u65F6"
|
||||
|
@ -7904,7 +7863,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7495235078447919709
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8868,7 +8827,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 283.29, y: 88.25}
|
||||
m_SizeDelta: {x: 314.11, y: 89.73}
|
||||
m_SizeDelta: {x: 415.05, y: 89.73}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5800105439827658996
|
||||
CanvasRenderer:
|
||||
|
@ -9369,6 +9328,101 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u672C\u671FUP\u5185\u5BB9"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &9152124072493924059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8858661580248806551}
|
||||
- component: {fileID: 5533042100985267421}
|
||||
- component: {fileID: 4919281995897281850}
|
||||
- component: {fileID: 7863921252034545443}
|
||||
m_Layer: 5
|
||||
m_Name: time
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8858661580248806551
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9152124072493924059}
|
||||
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: 1077569730892415883}
|
||||
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: 110, y: 0}
|
||||
m_SizeDelta: {x: 200, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5533042100985267421
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9152124072493924059}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4919281995897281850
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9152124072493924059}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98039216, g: 0.8745098, b: 0.6039216, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "30\u6B21\u5185\u5FC5\u5F97\u91D1\u8272\u53CA\u4EE5\u4E0A\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &7863921252034545443
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9152124072493924059}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &9182117690183553055
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -691,13 +691,13 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 20
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\uFF08\u8D2D\u4E70\u793C\u5305\u6216\u8005\u5145\u503C\u5996\u6676\u5747\u8BA1\u7B97\u5728\u5185\uFF09"
|
||||
|
@ -996,8 +996,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 187.8, y: -16.3}
|
||||
m_SizeDelta: {x: 664.5, y: 32.6}
|
||||
m_AnchoredPosition: {x: 189, y: -16.3}
|
||||
m_SizeDelta: {x: 633.5, y: 32.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6938332568360476517
|
||||
CanvasRenderer:
|
||||
|
@ -1031,9 +1031,9 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 26
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 20
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
|
|
@ -569,6 +569,8 @@ GameObject:
|
|||
- component: {fileID: 6113965863338318296}
|
||||
- component: {fileID: 9180927347325509713}
|
||||
- component: {fileID: 5620636299940482309}
|
||||
- component: {fileID: 9102919772214828371}
|
||||
- component: {fileID: 4500164768560858477}
|
||||
m_Layer: 5
|
||||
m_Name: TrialScopePre
|
||||
m_TagString: Untagged
|
||||
|
@ -588,15 +590,14 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4648856336061394264}
|
||||
- {fileID: 1846765365448550410}
|
||||
- {fileID: 4468969920106977496}
|
||||
m_Father: {fileID: 1116572309818407697}
|
||||
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: 452.1, y: -110}
|
||||
m_SizeDelta: {x: 790, y: 160}
|
||||
m_AnchoredPosition: {x: 452.1, y: -129.5}
|
||||
m_SizeDelta: {x: 790, y: 199}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9180927347325509713
|
||||
CanvasRenderer:
|
||||
|
@ -620,12 +621,49 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: 790
|
||||
m_MinHeight: 160
|
||||
m_MinHeight: 180
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!114 &9102919772214828371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1507259601628322409}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &4500164768560858477
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1507259601628322409}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 190
|
||||
m_Right: 0
|
||||
m_Top: 70
|
||||
m_Bottom: 10
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &2066976281135186190
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1300,7 +1338,7 @@ MonoBehaviour:
|
|||
m_IgnoreLayout: 0
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: 636
|
||||
m_PreferredWidth: 737.8
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
|
@ -1431,6 +1469,7 @@ GameObject:
|
|||
- component: {fileID: 4468969920106977496}
|
||||
- component: {fileID: 7706729034207408020}
|
||||
- component: {fileID: 7330232196393010559}
|
||||
- component: {fileID: 7858065972934123559}
|
||||
m_Layer: 5
|
||||
m_Name: Info
|
||||
m_TagString: Untagged
|
||||
|
@ -1450,13 +1489,13 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6113965863338318296}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 79.02498, y: -25}
|
||||
m_SizeDelta: {x: 631.95, y: 102.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 505.975, y: -70}
|
||||
m_SizeDelta: {x: 631.95, y: 119}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &7706729034207408020
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1498,8 +1537,22 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1.19
|
||||
m_Text: "\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11"
|
||||
m_Text: "\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11\u8D8A\u5C11"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &7858065972934123559
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4528316172026551083}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &4781946845096508240
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2000,9 +2053,9 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 160
|
||||
m_Left: 66
|
||||
m_Right: 0
|
||||
m_Top: 18
|
||||
m_Top: 67
|
||||
m_Bottom: 10
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
|
@ -3046,16 +3099,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6267568773098108917}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 6113965863338318296}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 4648856336061394264}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -56, y: 54.25}
|
||||
m_AnchoredPosition: {x: 180, y: 30}
|
||||
m_SizeDelta: {x: 363.2, y: 41.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3118883408828691511
|
||||
|
@ -3135,7 +3188,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -90, y: -24.25}
|
||||
m_SizeDelta: {x: 140, y: 140}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6272960656898666991
|
||||
|
@ -3434,13 +3487,14 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 8236387584583770248}
|
||||
- {fileID: 3285673016207254851}
|
||||
- {fileID: 1846765365448550410}
|
||||
m_Father: {fileID: 6113965863338318296}
|
||||
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: -326, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 190, y: -70}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2012838000031578887
|
||||
CanvasRenderer:
|
||||
|
@ -3484,7 +3538,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -90, y: -24.25}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8764550032414351278
|
||||
|
|
|
@ -56,6 +56,7 @@ function QianKunBox:InitComponent(gameObject)
|
|||
self.btnTen1 = Util.GetGameObject(self.bottom,"btnTen1")
|
||||
self.btnTen2 = Util.GetGameObject(self.bottom,"btnTen2")
|
||||
self.btnTimes= Util.GetGameObject(self.bottom,"countDown/di2/time"):GetComponent("Text")
|
||||
ForceRebuildLayout(self.btnTimes.gameObject.transform.parent)
|
||||
--limit
|
||||
self.limit = Util.GetGameObject(gameObject,"limitdi/limit"):GetComponent("Text")
|
||||
--detail
|
||||
|
|
|
@ -321,6 +321,10 @@ function TimeLimitedCall:InitComponent(gameObject)
|
|||
|
||||
self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --活动剩余时间
|
||||
self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --保底剩余次数
|
||||
|
||||
ForceRebuildLayout(Util.GetGameObject(self.gameObject,"Bg1/Image (7)").transform)
|
||||
ForceRebuildLayout(Util.GetGameObject(self.gameObject,"Bg2/Image (7)").transform)
|
||||
|
||||
end
|
||||
|
||||
function TimeLimitedCall:BindEvent()
|
||||
|
|
|
@ -53,7 +53,7 @@ function SoulPrintPopUp:InitComponent()
|
|||
this.trialScopePre=Util.GetGameObject(this.trialScope,"Scroll_1/TrialScopePre")--适用范围预设
|
||||
--数据大于4优化布局
|
||||
this.scroll_2=Util.GetGameObject(this.trialScope,"Scroll_2")--优化滚动条
|
||||
this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll_2.transform,this.trialScopePre, nil,Vector2.New(899.5,490),1,1,Vector2.New(0,15))
|
||||
this.scrollView=SubUIManager.Open(SubUIConfig.ScrollFitterView,this.scroll_2.transform,this.trialScopePre,Vector2.New(899.5,490), 1, 15)
|
||||
this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
|
||||
this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
||||
this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
||||
|
@ -237,10 +237,10 @@ function this.RefreshShow(type)
|
|||
local isOpenTrialScope=equipConfig[soulId].Range and equipConfig[soulId].Range[1]~=0 and equipConfig[soulId].Range[1]--是否开启适用
|
||||
if isOpenTrialScope then
|
||||
this.trialScopeText.text=Language[11527]
|
||||
this.scroll_1:SetActive(#equipConfig[soulId].Range<=3)
|
||||
this.scroll_2:SetActive(#equipConfig[soulId].Range>3)
|
||||
this.scroll_1:SetActive(#equipConfig[soulId].Range<=0)
|
||||
this.scroll_2:SetActive(#equipConfig[soulId].Range>0)
|
||||
--适用英雄<=3时 固定长度生成(预设) 反之使用优化滚动条
|
||||
if #equipConfig[soulId].Range<=3 then
|
||||
if #equipConfig[soulId].Range<=0 then
|
||||
for j = 0, this.scroll_1.transform.childCount-1 do
|
||||
this.scroll_1.transform:GetChild(j).gameObject:SetActive(false)
|
||||
end
|
||||
|
|
|
@ -332,7 +332,8 @@ function this:SetData(dataList, updateFunc, startIndex)
|
|||
self.dataList = dataList --传入的数据列表
|
||||
self.updateFunc = updateFunc --刷新回调,返回数据列表的索引和对应预设
|
||||
self.dataCount = #dataList
|
||||
self:SetIndex(startIndex or self.offsetIndex+1) --设置初始索引,若为空则默认为上一次索引
|
||||
self.offsetIndex = 0
|
||||
self:SetIndex(startIndex or self.offsetIndex + 1) --设置初始索引,若为空则默认为上一次索引
|
||||
end
|
||||
|
||||
function this:ForeachItemGO(func)
|
||||
|
|
|
@ -68,3 +68,8 @@ function GetPreferredWidth(_transform)
|
|||
end
|
||||
return LayoutUtility.GetPreferredWidth(_transform)
|
||||
end
|
||||
function ForceRebuildLayout(_transform)
|
||||
if LayoutRebuilder then
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(_transform)
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue