Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
44901a5410
|
@ -4502,6 +4502,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7609100429130394311}
|
||||
- component: {fileID: 2432625498151303212}
|
||||
- component: {fileID: 3539263886847067668}
|
||||
m_Layer: 5
|
||||
m_Name: scrollView
|
||||
m_TagString: Untagged
|
||||
|
@ -4526,9 +4528,46 @@ 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: -162, y: 0.000010967}
|
||||
m_SizeDelta: {x: 683.2, y: 143.8}
|
||||
m_AnchoredPosition: {x: -126.63, y: 0.000010967}
|
||||
m_SizeDelta: {x: 753.93, y: 143.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2432625498151303212
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6203369611878942705}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3539263886847067668
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6203369611878942705}
|
||||
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: 0}
|
||||
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 &6295287949743978313
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5290,7 +5329,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: -342, y: 72.000015}
|
||||
m_AnchoredPosition: {x: -377.37, y: 72.00008}
|
||||
m_SizeDelta: {x: 684, y: 144}
|
||||
m_Pivot: {x: 0, y: 1.0000001}
|
||||
--- !u!114 &8120024466581524718
|
||||
|
|
|
@ -821,6 +821,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7609100429130394311}
|
||||
- component: {fileID: 4175553623622581758}
|
||||
- component: {fileID: 7641389362264402416}
|
||||
m_Layer: 5
|
||||
m_Name: scrollView
|
||||
m_TagString: Untagged
|
||||
|
@ -845,9 +847,46 @@ 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: -136.23, y: 7}
|
||||
m_SizeDelta: {x: 662.35, y: 140}
|
||||
m_AnchoredPosition: {x: -115.45, y: 7}
|
||||
m_SizeDelta: {x: 703.91, y: 140}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4175553623622581758
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6203369611878942705}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7641389362264402416
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6203369611878942705}
|
||||
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: 0.10980393, g: 0.10980393, b: 0.10980393, a: 0}
|
||||
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 &6452769840770979102
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1131,8 +1170,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000061035156}
|
||||
m_SizeDelta: {x: -41.559998, y: 0}
|
||||
m_Pivot: {x: 0, y: 1.0000001}
|
||||
--- !u!114 &8120024466581524718
|
||||
MonoBehaviour:
|
||||
|
|
|
@ -16,7 +16,7 @@ local offSetX = {
|
|||
ima = Vector3.New(315.5,-32,0),
|
||||
txt1 = Vector3.New(158,-31.5,0),
|
||||
icon1 = Vector3.New(95,-27,0),
|
||||
scroll = Vector3.New(-306.21,67.1,0),
|
||||
scroll = Vector3.New(-346.21,67.1,0),
|
||||
},
|
||||
[1] = {
|
||||
icon = Vector3.New(513,-24,0),
|
||||
|
@ -24,7 +24,7 @@ local offSetX = {
|
|||
ima = Vector3.New(20.19,0,0),
|
||||
txt1 = Vector3.New(134,-32,0),
|
||||
icon1 = Vector3.New(80.39999,-24,0),
|
||||
scroll = Vector3.New(-254,71.9,0),
|
||||
scroll = Vector3.New(-294,71.9,0),
|
||||
},
|
||||
[2] = { icon = Vector3.New(316.7,-23,0),
|
||||
txt = Vector3.New(373.1,-32.69999,0),
|
||||
|
|
Loading…
Reference in New Issue