Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
60391c16b4
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -780,10 +780,10 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 5759458907260581076}
|
- component: {fileID: 5759458907260581076}
|
||||||
- component: {fileID: 2268112297203187335}
|
|
||||||
- component: {fileID: 3141451647582073682}
|
- component: {fileID: 3141451647582073682}
|
||||||
- component: {fileID: 5600276639709997912}
|
- component: {fileID: 5600276639709997912}
|
||||||
- component: {fileID: 5138165610675945150}
|
- component: {fileID: 5138165610675945150}
|
||||||
|
- component: {fileID: 1473550282977014420}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scrollRect
|
m_Name: scrollRect
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -811,19 +811,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: -50}
|
m_AnchoredPosition: {x: 0, y: -50}
|
||||||
m_SizeDelta: {x: 0, y: -100}
|
m_SizeDelta: {x: 0, y: -100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2268112297203187335
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2479383142512665533}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_ShowMaskGraphic: 0
|
|
||||||
--- !u!222 &3141451647582073682
|
--- !u!222 &3141451647582073682
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -844,7 +831,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
|
|
@ -893,6 +880,18 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!114 &1473550282977014420
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2479383142512665533}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &2658533052818541386
|
--- !u!1 &2658533052818541386
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3538,10 +3537,10 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7679809175275777088}
|
- component: {fileID: 7679809175275777088}
|
||||||
- component: {fileID: 3698492846638881566}
|
|
||||||
- component: {fileID: 4875746903694999264}
|
- component: {fileID: 4875746903694999264}
|
||||||
- component: {fileID: 5725152609552433708}
|
- component: {fileID: 5725152609552433708}
|
||||||
- component: {fileID: 860553753996015348}
|
- component: {fileID: 860553753996015348}
|
||||||
|
- component: {fileID: 228282531681914892}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scrollRect
|
m_Name: scrollRect
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -3569,19 +3568,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: -50}
|
m_AnchoredPosition: {x: 0, y: -50}
|
||||||
m_SizeDelta: {x: 0, y: -100}
|
m_SizeDelta: {x: 0, y: -100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &3698492846638881566
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7941768748633467235}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_ShowMaskGraphic: 0
|
|
||||||
--- !u!222 &4875746903694999264
|
--- !u!222 &4875746903694999264
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3602,7 +3588,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
|
|
@ -3651,6 +3637,18 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!114 &228282531681914892
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7941768748633467235}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &7947261403598486277
|
--- !u!1 &7947261403598486277
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -2877,6 +2877,8 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 8060973784394088321}
|
- component: {fileID: 8060973784394088321}
|
||||||
|
- component: {fileID: 8442645740951799786}
|
||||||
|
- component: {fileID: 5047410682410263552}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scroll
|
m_Name: scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -2903,6 +2905,43 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 81.4}
|
m_AnchoredPosition: {x: 0, y: 81.4}
|
||||||
m_SizeDelta: {x: 927.5, y: 978.2}
|
m_SizeDelta: {x: 927.5, y: 978.2}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8442645740951799786
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7837577505631096959}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5047410682410263552
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7837577505631096959}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &7837584785293409971
|
--- !u!1 &7837584785293409971
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1200,6 +1200,8 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3197490103942022047}
|
- component: {fileID: 3197490103942022047}
|
||||||
|
- component: {fileID: 133388500665279468}
|
||||||
|
- component: {fileID: 5419035180060586392}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scroll
|
m_Name: scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -1226,6 +1228,43 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 87.52498}
|
m_AnchoredPosition: {x: 0, y: 87.52498}
|
||||||
m_SizeDelta: {x: 927.5, y: 965.95}
|
m_SizeDelta: {x: 927.5, y: 965.95}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &133388500665279468
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3406194161806404705}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5419035180060586392
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3406194161806404705}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &3406226350511288493
|
--- !u!1 &3406226350511288493
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -4258,6 +4258,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1939177026611606392}
|
- component: {fileID: 1939177026611606392}
|
||||||
- component: {fileID: 1937634087149734782}
|
- component: {fileID: 1937634087149734782}
|
||||||
|
- component: {fileID: 3138624694152778311}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scroll
|
m_Name: scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4292,6 +4293,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1869611150155371252}
|
m_GameObject: {fileID: 1869611150155371252}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3138624694152778311
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1869611150155371252}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1869613631891814722
|
--- !u!1 &1869613631891814722
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -13724,6 +13754,8 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 8931883141293784445}
|
- component: {fileID: 8931883141293784445}
|
||||||
- component: {fileID: 314793541967843562}
|
- component: {fileID: 314793541967843562}
|
||||||
|
- component: {fileID: 6554334574166295044}
|
||||||
|
- component: {fileID: 5403743841401786723}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: selectHeroGrid
|
m_Name: selectHeroGrid
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -13779,6 +13811,43 @@ MonoBehaviour:
|
||||||
m_Spacing: {x: 77.48, y: 0}
|
m_Spacing: {x: 77.48, y: 0}
|
||||||
m_Constraint: 2
|
m_Constraint: 2
|
||||||
m_ConstraintCount: 1
|
m_ConstraintCount: 1
|
||||||
|
--- !u!222 &6554334574166295044
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8891037395469127299}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5403743841401786723
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8891037395469127299}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &8915669173798880494
|
--- !u!1 &8915669173798880494
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1326,6 +1326,8 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 224284833056434696}
|
- component: {fileID: 224284833056434696}
|
||||||
|
- component: {fileID: 8441201234771937878}
|
||||||
|
- component: {fileID: 3837139053022586153}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: scroll
|
m_Name: scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -1352,6 +1354,43 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 107}
|
m_AnchoredPosition: {x: 0, y: 107}
|
||||||
m_SizeDelta: {x: 927.5, y: 927}
|
m_SizeDelta: {x: 927.5, y: 927}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8441201234771937878
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1739547300218358}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3837139053022586153
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1739547300218358}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1741692233933420
|
--- !u!1 &1741692233933420
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -4335,6 +4335,8 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7656265836104597532}
|
- component: {fileID: 7656265836104597532}
|
||||||
|
- component: {fileID: 5314499766617022713}
|
||||||
|
- component: {fileID: 6559035210426676433}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Scroll
|
m_Name: Scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4361,6 +4363,43 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: -28.8}
|
m_AnchoredPosition: {x: 0, y: -28.8}
|
||||||
m_SizeDelta: {x: 900, y: 948.1}
|
m_SizeDelta: {x: 900, y: 948.1}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5314499766617022713
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 669882069863049176}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6559035210426676433
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 669882069863049176}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &691946464718676944
|
--- !u!1 &691946464718676944
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -29356,6 +29395,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4134529790793770453}
|
- component: {fileID: 4134529790793770453}
|
||||||
- component: {fileID: 1090357375526350085}
|
- component: {fileID: 1090357375526350085}
|
||||||
|
- component: {fileID: 1387854069419566085}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: star
|
m_Name: star
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -29390,6 +29430,29 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 9152079933032544111}
|
m_GameObject: {fileID: 9152079933032544111}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1387854069419566085
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 9152079933032544111}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 6
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 0
|
||||||
--- !u!1 &9160240826233526572
|
--- !u!1 &9160240826233526572
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -3005,6 +3005,7 @@ GameObject:
|
||||||
- component: {fileID: 2553759180244413173}
|
- component: {fileID: 2553759180244413173}
|
||||||
- component: {fileID: 5559974153339085360}
|
- component: {fileID: 5559974153339085360}
|
||||||
- component: {fileID: 8594897013185962644}
|
- component: {fileID: 8594897013185962644}
|
||||||
|
- component: {fileID: 4439679039454687099}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Scroll
|
m_Name: Scroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -3076,6 +3077,14 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!222 &4439679039454687099
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3853548438243551823}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
--- !u!1 &3886299620309998347
|
--- !u!1 &3886299620309998347
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4168,6 +4177,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 944098213738272631}
|
- component: {fileID: 944098213738272631}
|
||||||
- component: {fileID: 5438584371727106758}
|
- component: {fileID: 5438584371727106758}
|
||||||
|
- component: {fileID: 2618497146617067296}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: star
|
m_Name: star
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4202,6 +4212,29 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5681427206251380380}
|
m_GameObject: {fileID: 5681427206251380380}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &2618497146617067296
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5681427206251380380}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 6
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 0
|
||||||
--- !u!1 &5719908235039403081
|
--- !u!1 &5719908235039403081
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4648,6 +4681,8 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4908055247632876805}
|
- component: {fileID: 4908055247632876805}
|
||||||
|
- component: {fileID: 2567286864525828672}
|
||||||
|
- component: {fileID: 7336073635758433815}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: GameObject
|
m_Name: GameObject
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4681,6 +4716,43 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2567286864525828672
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6139901755147080176}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7336073635758433815
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6139901755147080176}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &6278859579252585660
|
--- !u!1 &6278859579252585660
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -4189,6 +4189,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2492555335493657461}
|
- component: {fileID: 2492555335493657461}
|
||||||
- component: {fileID: 7264707228109259493}
|
- component: {fileID: 7264707228109259493}
|
||||||
|
- component: {fileID: 1463406129850090696}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ItemListRoot
|
m_Name: ItemListRoot
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4223,6 +4224,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2819120374147908973}
|
m_GameObject: {fileID: 2819120374147908973}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1463406129850090696
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2819120374147908973}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &2854028092386135442
|
--- !u!1 &2854028092386135442
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -5980,6 +6010,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 4910242485821419028}
|
- component: {fileID: 4910242485821419028}
|
||||||
- component: {fileID: 3684918263632949848}
|
- component: {fileID: 3684918263632949848}
|
||||||
|
- component: {fileID: 1093422362649456572}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ItemListRoot
|
m_Name: ItemListRoot
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -6014,6 +6045,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4431145364068676807}
|
m_GameObject: {fileID: 4431145364068676807}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1093422362649456572
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4431145364068676807}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &4480184209769585281
|
--- !u!1 &4480184209769585281
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6642,7 +6702,7 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -7198,10 +7258,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 235641477404672219}
|
m_Father: {fileID: 235641477404672219}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 184.52998, y: -63.65}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 190, y: 58}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5004630570938477890
|
--- !u!222 &5004630570938477890
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -8218,6 +8278,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 5403932856111560861}
|
- component: {fileID: 5403932856111560861}
|
||||||
- component: {fileID: 5403932856111560862}
|
- component: {fileID: 5403932856111560862}
|
||||||
|
- component: {fileID: 1662750947976081219}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ItemListRoot
|
m_Name: ItemListRoot
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -8252,6 +8313,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5403932856111560860}
|
m_GameObject: {fileID: 5403932856111560860}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1662750947976081219
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5403932856111560860}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &5403932856370853838
|
--- !u!1 &5403932856370853838
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -9983,7 +10073,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1508773176926603313
|
--- !u!224 &1508773176926603313
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -10033,6 +10123,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7493297396072330528}
|
- component: {fileID: 7493297396072330528}
|
||||||
|
- component: {fileID: 7161690682615853999}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: star
|
m_Name: star
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -10059,6 +10150,29 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: -27.200073, y: -2.289856}
|
m_AnchoredPosition: {x: -27.200073, y: -2.289856}
|
||||||
m_SizeDelta: {x: 142.16, y: 29.089996}
|
m_SizeDelta: {x: 142.16, y: 29.089996}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!114 &7161690682615853999
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5774851079038251242}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 6
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 0
|
||||||
--- !u!1 &5808127690274937458
|
--- !u!1 &5808127690274937458
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -15073,10 +15187,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 235641477404672219}
|
m_Father: {fileID: 235641477404672219}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 377.56998, y: -63.65}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 190, y: 58}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3769464419337462616
|
--- !u!222 &3769464419337462616
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -15530,6 +15644,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 8120306587700567573}
|
- component: {fileID: 8120306587700567573}
|
||||||
- component: {fileID: 1609821383811113227}
|
- component: {fileID: 1609821383811113227}
|
||||||
|
- component: {fileID: 2244901784412925840}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ItemListRoot
|
m_Name: ItemListRoot
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -15564,6 +15679,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8702982654703153435}
|
m_GameObject: {fileID: 8702982654703153435}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &2244901784412925840
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8702982654703153435}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &8713559114260582039
|
--- !u!1 &8713559114260582039
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -15649,6 +15793,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 121018265363263051}
|
- component: {fileID: 121018265363263051}
|
||||||
- component: {fileID: 8550694524238033415}
|
- component: {fileID: 8550694524238033415}
|
||||||
|
- component: {fileID: 141218723707247498}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ItemListRoot
|
m_Name: ItemListRoot
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -15683,6 +15828,35 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8716657455423796376}
|
m_GameObject: {fileID: 8716657455423796376}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &141218723707247498
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8716657455423796376}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||||
|
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: 0}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &8722264005408772271
|
--- !u!1 &8722264005408772271
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -15766,6 +15940,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 5673655264526685079}
|
- component: {fileID: 5673655264526685079}
|
||||||
|
- component: {fileID: 2267312691036561670}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: star
|
m_Name: star
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -15792,6 +15967,29 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: -23.200073, y: 1.8100815}
|
m_AnchoredPosition: {x: -23.200073, y: 1.8100815}
|
||||||
m_SizeDelta: {x: 142.16, y: 29.089996}
|
m_SizeDelta: {x: 142.16, y: 29.089996}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!114 &2267312691036561670
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8747452094286943837}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 6
|
||||||
|
m_Spacing: 0
|
||||||
|
m_ChildForceExpandWidth: 0
|
||||||
|
m_ChildForceExpandHeight: 0
|
||||||
|
m_ChildControlWidth: 0
|
||||||
|
m_ChildControlHeight: 0
|
||||||
--- !u!1 &8774376236652444173
|
--- !u!1 &8774376236652444173
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -929,7 +929,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
|
|
|
||||||
|
|
@ -409,10 +409,6 @@ function GetStarOrGodSoulLv(index,data)
|
||||||
return data.star,index
|
return data.star,index
|
||||||
end
|
end
|
||||||
|
|
||||||
function SetOriScale()
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
|
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
|
||||||
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)
|
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor();
|
||||||
TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||||
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
|
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
|
||||||
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
|
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
|
||||||
DIFFICULTMAPOPTION = protobuf.Descriptor();
|
DIFFICULTMAPOPTION = protobuf.Descriptor();
|
||||||
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
|
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
|
||||||
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
|
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
@ -352,11 +353,21 @@ TRIALHEROINFO_POSITION_FIELD.default_value = 0
|
||||||
TRIALHEROINFO_POSITION_FIELD.type = 5
|
TRIALHEROINFO_POSITION_FIELD.type = 5
|
||||||
TRIALHEROINFO_POSITION_FIELD.cpp_type = 1
|
TRIALHEROINFO_POSITION_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.name = "godSoulLv"
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.godSoulLv"
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.number = 8
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.index = 7
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.label = 1
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.has_default_value = false
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.default_value = 0
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.type = 5
|
||||||
|
TRIALHEROINFO_GODSOULLV_FIELD.cpp_type = 1
|
||||||
|
|
||||||
TRIALHEROINFO.name = "TrialHeroInfo"
|
TRIALHEROINFO.name = "TrialHeroInfo"
|
||||||
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
|
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
|
||||||
TRIALHEROINFO.nested_types = {}
|
TRIALHEROINFO.nested_types = {}
|
||||||
TRIALHEROINFO.enum_types = {}
|
TRIALHEROINFO.enum_types = {}
|
||||||
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD}
|
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD, TRIALHEROINFO_GODSOULLV_FIELD}
|
||||||
TRIALHEROINFO.is_extendable = false
|
TRIALHEROINFO.is_extendable = false
|
||||||
TRIALHEROINFO.extensions = {}
|
TRIALHEROINFO.extensions = {}
|
||||||
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"
|
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"
|
||||||
|
|
|
||||||
|
|
@ -303,14 +303,14 @@ function this.FreshTeam2(formation, isBlue)
|
||||||
end
|
end
|
||||||
for i, hero in ipairs(formation.teamHeroInfos) do
|
for i, hero in ipairs(formation.teamHeroInfos) do
|
||||||
local heroData = HeroManager.GetSingleHeroData(formation.teamHeroInfos[i].heroId)
|
local heroData = HeroManager.GetSingleHeroData(formation.teamHeroInfos[i].heroId)
|
||||||
teamRoot[heroData.position].hero:SetActive(true)
|
teamRoot[hero.position].hero:SetActive(true)
|
||||||
teamRoot[heroData.position].levelText.text = heroData.lv
|
teamRoot[hero.position].levelText.text = heroData.lv
|
||||||
local star,starType = heroData.GetStar(1)
|
local star,starType = heroData.GetStar(1)
|
||||||
SetHeroStars(this.spLoader, teamRoot[heroData.position].starGrid, star,starType)
|
SetHeroStars(this.spLoader, teamRoot[hero.position].starGrid, star,starType)
|
||||||
local heroConfig = heroData.heroConfig
|
local heroConfig = heroData.heroConfig
|
||||||
teamRoot[heroData.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
teamRoot[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||||
heroData,teamRoot[heroData.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
|
teamRoot[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon)
|
||||||
teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- 控制显示编队信息
|
-- 控制显示编队信息
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,6 @@ function DamageResultPanel:InitComponent()
|
||||||
this.TabCtrl = TabBox.New()
|
this.TabCtrl = TabBox.New()
|
||||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||||
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
|
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
|
||||||
this.TabCtrl:Init(this.tabbox, _TabData)
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
@ -77,7 +75,7 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function DamageResultPanel:OnOpen(result)
|
function DamageResultPanel:OnOpen(result)
|
||||||
|
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||||
this.leftResult.sprite = this.spLoader:LoadSprite(result == 1 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
this.leftResult.sprite = this.spLoader:LoadSprite(result == 1 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
||||||
this.rightResult.sprite = this.spLoader:LoadSprite(result == 0 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
this.rightResult.sprite = this.spLoader:LoadSprite(result == 0 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
||||||
|
|
||||||
|
|
@ -110,7 +108,9 @@ function DamageResultPanel:OnOpen(result)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
function DamageResultPanel:OnShow()end
|
function DamageResultPanel:OnShow()
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
function this.isTabShow(index)
|
function this.isTabShow(index)
|
||||||
if not this.battleRecord then
|
if not this.battleRecord then
|
||||||
|
|
@ -402,7 +402,7 @@ function this.HeadAdapter(head, data)
|
||||||
starType = 3
|
starType = 3
|
||||||
end
|
end
|
||||||
SetHeroStars(this.spLoader, starRoot, star,starType)
|
SetHeroStars(this.spLoader, starRoot, star,starType)
|
||||||
Util.SetParticleSortLayer(starRoot,this.sortingorder + 1)
|
Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1)
|
||||||
-- 职业
|
-- 职业
|
||||||
prefess:SetActive(false)
|
prefess:SetActive(false)
|
||||||
-- 属性
|
-- 属性
|
||||||
|
|
@ -423,7 +423,7 @@ function this.HeadAdapter(head, data)
|
||||||
lvText.text = roleLv
|
lvText.text = roleLv
|
||||||
-- 星级
|
-- 星级
|
||||||
SetHeroStars(this.spLoader, starRoot, star)
|
SetHeroStars(this.spLoader, starRoot, star)
|
||||||
Util.SetParticleSortLayer(starRoot,this.sortingorder + 1)
|
Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1)
|
||||||
-- 头像
|
-- 头像
|
||||||
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality))
|
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality))
|
||||||
icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon))
|
icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon))
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ function this:ShowSingleData(go,heroData,index)
|
||||||
end
|
end
|
||||||
local star,starType = heroData.GetStar(1)
|
local star,starType = heroData.GetStar(1)
|
||||||
SetHeroStars(self.spLoader, starGrid, star,starType)
|
SetHeroStars(self.spLoader, starGrid, star,starType)
|
||||||
Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1)
|
Util.SetParticleSortLayer(starGrid,sortingOrder + 1)
|
||||||
Util.AddOnceClick(go, function()
|
Util.AddOnceClick(go, function()
|
||||||
for i = 1, #self.maskList do
|
for i = 1, #self.maskList do
|
||||||
self.maskList[i]:SetActive(false)
|
self.maskList[i]:SetActive(false)
|
||||||
|
|
|
||||||
|
|
@ -91,11 +91,11 @@ function ResolvePanel:BindEvent()
|
||||||
print(Language[12153]..tabSortType)
|
print(Language[12153]..tabSortType)
|
||||||
if tabSortType == i-1 then
|
if tabSortType == i-1 then
|
||||||
tabSortType = 0
|
tabSortType = 0
|
||||||
this.contents[curIndex].view.SortTypeClick(0)--全部
|
this.contents[curIndex].view.SortTypeClick(this.sortingOrder,0)--全部
|
||||||
this.EndTabBtnSelect()
|
this.EndTabBtnSelect()
|
||||||
else
|
else
|
||||||
tabSortType = i-1
|
tabSortType = i-1
|
||||||
this.contents[curIndex].view.SortTypeClick(i-1)
|
this.contents[curIndex].view.SortTypeClick(this.sortingOrder,i-1)
|
||||||
this.EndTabBtnSelect(heroEndBtns[i])
|
this.EndTabBtnSelect(heroEndBtns[i])
|
||||||
end
|
end
|
||||||
PlayerManager.now_index = tabSortType
|
PlayerManager.now_index = tabSortType
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
----- 献祭 -----
|
----- 献祭 -----
|
||||||
local this = {}
|
local this = {}
|
||||||
local sortingOrder=0
|
local sortingOrder=0
|
||||||
|
local sort = 0
|
||||||
local tabSortType = 0
|
local tabSortType = 0
|
||||||
local tarHero
|
local tarHero
|
||||||
local selectHeroData={}--选择的英雄list did = data
|
local selectHeroData={}--选择的英雄list did = data
|
||||||
|
|
@ -72,14 +73,15 @@ end
|
||||||
|
|
||||||
function this:OnShow(...)
|
function this:OnShow(...)
|
||||||
local args={...}
|
local args={...}
|
||||||
|
sort = args[1]
|
||||||
sortingOrder = PlayerManager.now_index or 0
|
sortingOrder = PlayerManager.now_index or 0
|
||||||
this.SortTypeClick(sortingOrder,args[3],args[4])
|
this.SortTypeClick(sort,sortingOrder,args[3],args[4])
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--展示数据
|
--展示数据
|
||||||
function this.SortTypeClick(_sortType,isTop,isAni)
|
function this.SortTypeClick(sortingOrder,_sortType,isTop,isAni)
|
||||||
LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni))
|
sort = sortingOrder
|
||||||
tabSortType=_sortType
|
tabSortType=_sortType
|
||||||
selectHeroData={}
|
selectHeroData={}
|
||||||
tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2)
|
tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2)
|
||||||
|
|
@ -119,7 +121,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
starSize = Vector2.New(60,57)
|
starSize = Vector2.New(60,57)
|
||||||
end
|
end
|
||||||
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
|
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
|
||||||
Util.SetParticleSortLayer(starGrid, sortingOrder + 1)
|
Util.SetParticleSortLayer(starGrid, sort + 1)
|
||||||
local choosed =Util.GetGameObject(_go.transform, "choosed")
|
local choosed =Util.GetGameObject(_go.transform, "choosed")
|
||||||
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
|
local formationMask =Util.GetGameObject(_go.transform, "formationMask")
|
||||||
Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh")
|
Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh")
|
||||||
|
|
|
||||||
|
|
@ -65,15 +65,14 @@ end
|
||||||
|
|
||||||
function this:OnShow(...)
|
function this:OnShow(...)
|
||||||
local args={...}
|
local args={...}
|
||||||
sortingOrder =0
|
|
||||||
sortingOrder = PlayerManager.now_index or 0
|
sortingOrder = PlayerManager.now_index or 0
|
||||||
|
|
||||||
--LogGreen(PlayerManager.now_index)
|
--LogGreen(PlayerManager.now_index)
|
||||||
this.SortTypeClick(sortingOrder,args[3],args[4])
|
this.SortTypeClick(0,sortingOrder,args[3],args[4])
|
||||||
end
|
end
|
||||||
|
|
||||||
--展示数据
|
--展示数据
|
||||||
function this.SortTypeClick(_sortType,isTop,isAni)
|
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
|
||||||
tabSortType=_sortType
|
tabSortType=_sortType
|
||||||
selectEquipTreasureData={}
|
selectEquipTreasureData={}
|
||||||
if tabSortType == 0 then
|
if tabSortType == 0 then
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,7 @@ function this:BindEvent()
|
||||||
end
|
end
|
||||||
selectChipId = 0
|
selectChipId = 0
|
||||||
oldChoosed = nil
|
oldChoosed = nil
|
||||||
this.SortTypeClick(sortingOrder)
|
this.SortTypeClick(0,sortingOrder)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
@ -182,11 +182,11 @@ function this:OnShow(...)
|
||||||
local args={...}
|
local args={...}
|
||||||
sortingOrder =0
|
sortingOrder =0
|
||||||
this.chooseObjList = {}
|
this.chooseObjList = {}
|
||||||
this.SortTypeClick(sortingOrder,args[3],args[4])
|
this.SortTypeClick(0,sortingOrder,args[3],args[4])
|
||||||
end
|
end
|
||||||
|
|
||||||
--展示数据
|
--展示数据
|
||||||
function this.SortTypeClick(_sortType,isTop,isAni)
|
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
|
||||||
tabSortType=_sortType
|
tabSortType=_sortType
|
||||||
selectHeroData={}
|
selectHeroData={}
|
||||||
--所有灵兽数据
|
--所有灵兽数据
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ function this:OnShow(...)
|
||||||
sortType = PlayerManager.now_index or 0
|
sortType = PlayerManager.now_index or 0
|
||||||
|
|
||||||
--LogGreen(PlayerManager.now_index)
|
--LogGreen(PlayerManager.now_index)
|
||||||
this.SortTypeClick(sortType,args[3],args[4])
|
this.SortTypeClick(sortingOrder,sortType,args[3],args[4])
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnClose()
|
function this:OnClose()
|
||||||
|
|
@ -75,7 +75,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
--展示数据
|
--展示数据
|
||||||
function this.SortTypeClick(_sortType,isTop,isAni)
|
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
|
||||||
selectHeroData={}
|
selectHeroData={}
|
||||||
|
|
||||||
tarHero={}
|
tarHero={}
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ function this:OnShow(...)
|
||||||
|
|
||||||
--LogGreen(PlayerManager.now_index)
|
--LogGreen(PlayerManager.now_index)
|
||||||
|
|
||||||
this.SortTypeClick(sortType,args[3],args[4])
|
this.SortTypeClick(sortingOrder,sortType,args[3],args[4])
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnClose()
|
function this:OnClose()
|
||||||
|
|
@ -76,7 +76,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
--展示数据
|
--展示数据
|
||||||
function this.SortTypeClick(_sortType,isTop,isAni)
|
function this.SortTypeClick(_sort,_sortType,isTop,isAni)
|
||||||
selectHeroData={}
|
selectHeroData={}
|
||||||
|
|
||||||
tarHero={}
|
tarHero={}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue