Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-10-22 18:07:09 +08:00
commit 00ae40d23a
1 changed files with 29 additions and 29 deletions

View File

@ -4716,7 +4716,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: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 52, y: 30} m_SizeDelta: {x: 52, y: 30}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
@ -6459,7 +6459,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1529673525537688026} - component: {fileID: 1529673525537688026}
- component: {fileID: 2837923671425565333} - component: {fileID: 2837923671425565333}
- component: {fileID: 3094339998828272268}
m_Layer: 5 m_Layer: 5
m_Name: useless m_Name: useless
m_TagString: Untagged m_TagString: Untagged
@ -6487,8 +6486,8 @@ RectTransform:
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: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 34.777} m_AnchoredPosition: {x: 0, y: -0.00022125}
m_SizeDelta: {x: 0, y: 69.555} m_SizeDelta: {x: 0, y: 0.00054932}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2837923671425565333 --- !u!222 &2837923671425565333
CanvasRenderer: CanvasRenderer:
@ -6498,26 +6497,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153980339016827523} m_GameObject: {fileID: 1153980339016827523}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &3094339998828272268
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153980339016827523}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &1178360206124199499 --- !u!1 &1178360206124199499
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6596,7 +6575,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 233.65002} m_AnchoredPosition: {x: 0, y: 202}
m_SizeDelta: {x: 900, y: 4} m_SizeDelta: {x: 900, y: 4}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3212449414660254376 --- !u!222 &3212449414660254376
@ -6670,7 +6649,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 74, y: 117} m_AnchoredPosition: {x: 74, y: 148}
m_SizeDelta: {x: 100, y: 64.41} m_SizeDelta: {x: 100, y: 64.41}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4855449838437395217 --- !u!222 &4855449838437395217
@ -10044,7 +10023,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -10, y: 120} m_AnchoredPosition: {x: -10, y: 151}
m_SizeDelta: {x: 70, y: 70} m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5904772888858199427 --- !u!222 &5904772888858199427
@ -24028,6 +24007,7 @@ GameObject:
- component: {fileID: 2925180131101153177} - component: {fileID: 2925180131101153177}
- component: {fileID: 6232789332412041360} - component: {fileID: 6232789332412041360}
- component: {fileID: 7795587465808298812} - component: {fileID: 7795587465808298812}
- component: {fileID: 1776600782014210398}
m_Layer: 5 m_Layer: 5
m_Name: Contents m_Name: Contents
m_TagString: Untagged m_TagString: Untagged
@ -24133,6 +24113,26 @@ MonoBehaviour:
isPlayAudio: 1 isPlayAudio: 1
isHaveCloseBtn: 0 isHaveCloseBtn: 0
isPlayOnOpen: 1 isPlayOnOpen: 1
--- !u!114 &1776600782014210398
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4348809421390657025}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &4366805869940194169 --- !u!1 &4366805869940194169
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -25251,7 +25251,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: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0} m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -46958,7 +46958,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &4248043991083370822 --- !u!224 &4248043991083370822
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0