Merge branch 'tcx_xiyou_solider' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_solider

tcx_xiyou_solider^2
PC-202302260912\Administrator 2024-04-26 19:22:14 +08:00
commit 7ca2359d36
1 changed files with 101 additions and 10 deletions

View File

@ -132,7 +132,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.735849, g: 0.49418494, b: 0.14231041, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -422,7 +422,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: -247, y: -34.3}
m_AnchoredPosition: {x: -256.9, y: -31}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &998437797488356161
@ -462,6 +462,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6055865409668327171
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4116637274905364341}
- component: {fileID: 7302873519381398609}
- component: {fileID: 4186748663763423203}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4116637274905364341
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6055865409668327171}
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: 8372885338800651131}
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: -197, y: 38}
m_SizeDelta: {x: 300, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7302873519381398609
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6055865409668327171}
m_CullTransparentMesh: 0
--- !u!114 &4186748663763423203
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6055865409668327171}
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: e1cde786b05a9c449b547ab4669debb8, 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 &6638985178763289226
GameObject:
m_ObjectHideFlags: 0
@ -787,7 +861,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 1, b: 0.13103461, a: 1}
m_Color: {r: 0.10946956, g: 0.5660378, b: 0.16855483, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1138,7 +1212,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.4528302, g: 0.40370238, b: 0.40370238, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1654,6 +1728,7 @@ GameObject:
- component: {fileID: 6318449757317619769}
- component: {fileID: 481393429516975087}
- component: {fileID: 2427806554675372309}
- component: {fileID: 3696258728993858323}
m_Layer: 5
m_Name: value
m_TagString: Untagged
@ -1677,7 +1752,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: 259.6, y: -9.2}
m_AnchoredPosition: {x: 259.6, y: -6}
m_SizeDelta: {x: 602.86, y: 71.429}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &481393429516975087
@ -1701,7 +1776,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.8301887, g: 0.7364173, b: 0.11356357, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -1722,6 +1797,21 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 0
m_Text: 9999999
--- !u!114 &3696258728993858323
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7660906213016610932}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8586427363958313225
GameObject:
m_ObjectHideFlags: 0
@ -1780,7 +1870,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.85490197, b: 0.7137255, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1830,7 +1920,8 @@ RectTransform:
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_Children:
- {fileID: 4116637274905364341}
m_Father: {fileID: 7407381691913007219}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1867,7 +1958,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3}
m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -2008,7 +2099,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.7372549, g: 0.49803922, b: 0.14509805, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls: