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

xiyou_yueNanZhengshi
zhangjiannan 2024-11-27 17:21:15 +08:00
commit ecdfe24d0b
20 changed files with 271 additions and 271 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 960dece3ca74d664caa8b951219e69f7
guid: a73986dc70b67d14fb27de39268087ea
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 8ea3a4dc3b1c90847a733f9144728452
spriteID: 5d64a9286b791584786cefe176ba9fbd
vertices: []
indices:
edges: []

View File

@ -1402,8 +1402,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 135.5, y: -18.5}
m_SizeDelta: {x: 271, y: 37}
m_AnchoredPosition: {x: 145, y: -18.5}
m_SizeDelta: {x: 290, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6495588927036638659
CanvasRenderer:
@ -1476,7 +1476,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: -127, y: 1}
m_AnchoredPosition: {x: -154.6001, y: 1}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4701192788520570845
@ -2092,7 +2092,7 @@ MonoBehaviour:
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 271, y: 37}
m_CellSize: {x: 290, y: 37}
m_Spacing: {x: 0, y: 0}
m_Constraint: 1
m_ConstraintCount: 1
@ -2241,8 +2241,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: 1.3, y: 3}
m_SizeDelta: {x: 184, y: 39}
m_AnchoredPosition: {x: 13.39, y: 3}
m_SizeDelta: {x: 254.67, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6500783828367067171
CanvasRenderer:
@ -2279,7 +2279,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -2730,7 +2730,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: 100, y: 20}
m_AnchoredPosition: {x: 137.6, y: 31.1}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6697413273450810149
@ -2952,7 +2952,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: -127.2, y: 2.4}
m_AnchoredPosition: {x: -154.8, y: 2.4}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7157460571225524541
@ -3219,8 +3219,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: -1108, y: 173}
m_SizeDelta: {x: 325, y: 87}
m_AnchoredPosition: {x: -1080.01, y: 173}
m_SizeDelta: {x: 380.99, y: 87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1102756234027167001
CanvasRenderer:
@ -3251,7 +3251,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 4821f897b6fb6dc42b69932fb799ad06, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -3822,8 +3822,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 135.5, y: -55.5}
m_SizeDelta: {x: 271, y: 37}
m_AnchoredPosition: {x: 145, y: -55.5}
m_SizeDelta: {x: 290, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5074906141544346636
CanvasRenderer:
@ -4157,8 +4157,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 135.5, y: -92.5}
m_SizeDelta: {x: 271, y: 37}
m_AnchoredPosition: {x: 145, y: -92.5}
m_SizeDelta: {x: 290, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3282577278308170168
CanvasRenderer:
@ -4838,8 +4838,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 135.5, y: -129.5}
m_SizeDelta: {x: 271, y: 37}
m_AnchoredPosition: {x: 145, y: -129.5}
m_SizeDelta: {x: 290, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3619866950882426101
CanvasRenderer:

View File

@ -711,7 +711,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: -1.8, y: -401}
m_AnchoredPosition: {x: -1.8, y: -394}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &380322857252361036
@ -3403,7 +3403,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: 0.099999994, y: -63}
m_AnchoredPosition: {x: 0.099999994, y: -45}
m_SizeDelta: {x: 384.31, y: 64.410034}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1937419862058096008
@ -4146,8 +4146,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: 204, y: -611}
m_SizeDelta: {x: 260, y: 74}
m_AnchoredPosition: {x: 204, y: -598}
m_SizeDelta: {x: 260, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1937221655816918808
CanvasRenderer:
@ -4179,7 +4179,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
@ -4237,7 +4237,7 @@ Animator:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1869609160761531214}
m_Enabled: 1
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
@ -6483,7 +6483,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: -3.9, y: -472}
m_AnchoredPosition: {x: -3.9, y: -486}
m_SizeDelta: {x: 923.7, y: 200.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1761273765767981667
@ -10930,8 +10930,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: -203.8, y: -609.7}
m_SizeDelta: {x: 260, y: 74}
m_AnchoredPosition: {x: -203.8, y: -596.7}
m_SizeDelta: {x: 260, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7253453419435099524
CanvasRenderer:
@ -10963,7 +10963,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
@ -11021,7 +11021,7 @@ Animator:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7253453419435099529}
m_Enabled: 1
m_Enabled: 0
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
@ -13784,7 +13784,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: 4.830002, y: -296}
m_AnchoredPosition: {x: 4.830002, y: -258}
m_SizeDelta: {x: 547.6, y: 200.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &314793541967843562

View File

@ -69,7 +69,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -263,7 +263,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -374,7 +374,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -485,7 +485,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -596,7 +596,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -681,7 +681,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: -250}
m_AnchoredPosition: {x: 10, y: -223}
m_SizeDelta: {x: 800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1576026678
@ -799,7 +799,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -910,7 +910,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@ -1021,7 +1021,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3

View File

@ -25861,7 +25861,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: 28.3, y: 0.0000069141}
m_AnchoredPosition: {x: 99, y: -5.2}
m_SizeDelta: {x: 121.51, y: 40.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4731455805283454071
@ -68146,8 +68146,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 94.600006, y: -19.190002}
m_SizeDelta: {x: 213, y: 58}
m_AnchoredPosition: {x: 47.6, y: -19.190002}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1798275871522754023
CanvasRenderer:
@ -68177,7 +68177,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: 54b159ca46c66ab4b88b0c543c385682, type: 3}
m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -73777,61 +73777,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 4239138255771575618}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 1478786657260596419}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8145092030358069884}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 8834863461068896970}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 3934879465561439888}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 1298431382559632061}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 8215435202396873296}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8345161809758301208}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4109518020871527147}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 8630497023421281403}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 4239138255771575618}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -73887,6 +73832,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 6789526059838717039}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 4239138255771575618}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 1478786657260596419}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8145092030358069884}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 8834863461068896970}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 3934879465561439888}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 1298431382559632061}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 8215435202396873296}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8345161809758301208}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4109518020871527147}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 8630497023421281403}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 4239138255771575618}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &6642769763838568755 stripped
@ -74124,61 +74124,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 662747332772281235}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 2838191739614327314}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 4823305674520378541}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 5295460731459003419}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1085587704857244898}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 2441523354941633644}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 4748458885330304129}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 4623231488584757961}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 3704848856444800584}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5642701455126167049}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 662747332772281235}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74234,6 +74179,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 7917258885034123966}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 662747332772281235}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 2838191739614327314}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 4823305674520378541}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 5295460731459003419}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1085587704857244898}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 2441523354941633644}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 4748458885330304129}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 4623231488584757961}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 3704848856444800584}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5642701455126167049}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 662747332772281235}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &1875746557491206881 stripped
@ -74465,11 +74465,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
@ -74480,61 +74475,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 242976170226757424}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3246810435530417841}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5224851005951387662}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4832632607405404344}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1085587704857244898}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3138934397645299919}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5442704090709780514}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5351595982620730986}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4109518020871527147}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5642701455126167049}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 242976170226757424}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74590,6 +74535,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 7472164165561955869}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 242976170226757424}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3246810435530417841}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5224851005951387662}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4832632607405404344}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 1085587704857244898}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3138934397645299919}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5442704090709780514}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5351595982620730986}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4109518020871527147}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 5642701455126167049}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 242976170226757424}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &4378795258779545256 stripped

View File

@ -1109,8 +1109,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: -14.6, y: 167}
m_SizeDelta: {x: 253, y: 310}
m_AnchoredPosition: {x: 6, y: 183}
m_SizeDelta: {x: 300, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7843520918456253060
CanvasRenderer:
@ -1140,7 +1140,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: 3e8ed147f86c3724b8d374c9ec937f97, type: 3}
m_Sprite: {fileID: 21300000, guid: 33251cd32c56ad74e92261dbae141514, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -9701,7 +9701,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_TargetGraphic: {fileID: 6007162569723480479}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -30676,7 +30676,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: -328.1}
m_AnchoredPosition: {x: 0, y: -353}
m_SizeDelta: {x: 212.66, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1302051257419407867
@ -41330,7 +41330,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: -328.1}
m_AnchoredPosition: {x: 0, y: -353}
m_SizeDelta: {x: 212.66, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4450733372872219073
@ -52022,7 +52022,7 @@ 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.80000305, y: 0}
m_AnchoredPosition: {x: 0.80000305, y: 6}
m_SizeDelta: {x: -54.51, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5716217659202862554
@ -52055,15 +52055,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u796D \u7940"
@ -52661,7 +52661,7 @@ 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.80000305, y: 0}
m_AnchoredPosition: {x: 0.80000305, y: 6}
m_SizeDelta: {x: -54.51, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8346433259537092315
@ -52694,15 +52694,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u796D \u7940"
@ -63692,7 +63692,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: -328.1}
m_AnchoredPosition: {x: 0, y: -353}
m_SizeDelta: {x: 212.66, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4219218564692603740
@ -64085,7 +64085,7 @@ 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.80000305, y: 0}
m_AnchoredPosition: {x: 0.80000305, y: 6}
m_SizeDelta: {x: -54.51, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2992859326272719800
@ -64118,15 +64118,15 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u796D \u7940"

View File

@ -2018,7 +2018,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 25
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -2830,8 +2830,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: -420.6}
m_SizeDelta: {x: 348.3, y: 38.6}
m_AnchoredPosition: {x: 0, y: -419.14}
m_SizeDelta: {x: 348.3, y: 80.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396217156366675
CanvasRenderer:
@ -5717,7 +5717,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -192, y: -250}
m_SizeDelta: {x: 256, y: 740}
m_SizeDelta: {x: 300, y: 740}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396217607456268
CanvasRenderer:
@ -6523,8 +6523,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: 3.75, y: -36.299892}
m_SizeDelta: {x: 152.5, y: 151.62}
m_AnchoredPosition: {x: 0, y: -36.299892}
m_SizeDelta: {x: 174, y: 151.62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396217779087859
CanvasRenderer:
@ -8406,8 +8406,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: 2.5, y: -70}
m_SizeDelta: {x: 95.9, y: 230}
m_AnchoredPosition: {x: 0.7, y: -83.9}
m_SizeDelta: {x: 119.3, y: 271.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396218156213643
CanvasRenderer:
@ -8724,8 +8724,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: 2.1, y: -70}
m_SizeDelta: {x: 94.3, y: 230}
m_AnchoredPosition: {x: 0.7, y: -83.9}
m_SizeDelta: {x: 119.3, y: 271.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396218194045670
CanvasRenderer:
@ -9112,8 +9112,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: 3.75, y: -36.3}
m_SizeDelta: {x: 152.5, y: 151.62}
m_AnchoredPosition: {x: 0, y: -36.3}
m_SizeDelta: {x: 174.2, y: 151.62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396218226334701
CanvasRenderer:
@ -10828,7 +10828,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 25
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -10981,7 +10981,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 133, y: -250}
m_SizeDelta: {x: 256, y: 740}
m_SizeDelta: {x: 300, y: 740}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396218678684763
CanvasRenderer:
@ -12392,8 +12392,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: -420.6}
m_SizeDelta: {x: 348.3, y: 38.6}
m_AnchoredPosition: {x: 0, y: -419.14}
m_SizeDelta: {x: 348.3, y: 80.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791396218904049445
CanvasRenderer:
@ -12546,8 +12546,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: 5.7299995}
m_SizeDelta: {x: 0, y: -11.45}
m_AnchoredPosition: {x: 0, y: 12.7}
m_SizeDelta: {x: 0, y: 2.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8356029433809488682
CanvasRenderer:

View File

@ -16811,7 +16811,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: 3.5, y: 10}
m_AnchoredPosition: {x: 12.9, y: 0}
m_SizeDelta: {x: 205.3, y: 58.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3691621985794044790
@ -17061,7 +17061,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 40, y: 18}
m_SizeDelta: {x: 244.1, y: 110.4}
m_SizeDelta: {x: 270, y: 110.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8219552810004848678
CanvasRenderer:
@ -17720,8 +17720,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4312105230113760187}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: -15.5, y: 7, z: -10}
m_LocalScale: {x: 66.8435, y: 27.35551, z: 0}
m_LocalPosition: {x: -19.47, y: 7, z: -10}
m_LocalScale: {x: 74.356705, y: 27.35551, z: 0}
m_Children: []
m_Father: {fileID: 2958699505434877776}
m_RootOrder: 2
@ -39053,8 +39053,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: 13.00006, y: -6}
m_SizeDelta: {x: 100, y: 100}
m_AnchoredPosition: {x: 17.49, y: -6}
m_SizeDelta: {x: 152.4, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6917791081141586428
GameObject:

View File

@ -944,7 +944,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 216, y: -31.92}
m_AnchoredPosition: {x: 158.9, y: -31.92}
m_SizeDelta: {x: 289.79, y: 53.53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5953798013439098580

View File

@ -1052,7 +1052,7 @@ 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.0007324219, y: 0.000061035156}
m_AnchoredPosition: {x: -0.0007324219, y: 5.4}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1368082059756365163
@ -2166,7 +2166,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: 94.6, y: 19}
m_AnchoredPosition: {x: 124.1, y: 28.4}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7597702777668687824
@ -2990,8 +2990,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: 268.5, y: -99.5}
m_SizeDelta: {x: 266, y: 80}
m_AnchoredPosition: {x: 268.5, y: -103.9}
m_SizeDelta: {x: 320, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440013227534213861
CanvasRenderer:

View File

@ -47795,8 +47795,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 219, y: -269}
m_SizeDelta: {x: 375, y: 99}
m_AnchoredPosition: {x: 258, y: -269}
m_SizeDelta: {x: 500, y: 99}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7386729104791266632
CanvasRenderer:

View File

@ -2181,7 +2181,7 @@
[12180] = GetLanguageStrById("不朽天赋"),
[12181] = GetLanguageStrById("全体神将"),
[12182] = GetLanguageStrById(" 主角礼物加成+%s (%s%%)"),
[12183] = GetLanguageStrById(" 修炼加成+%s (%s%%)"),
[12183] = GetLanguageStrById(" 修炼加成+ (%s%%)"),
[12184] = GetLanguageStrById(" <color=#1CC853>潜能 +%s(%s%%)</color>"),
[12185] = GetLanguageStrById("全体神将潜能等级+"),
[12186] = GetLanguageStrById("神将潜能等级+"),

View File

@ -906,7 +906,7 @@ function this.CreatSingleMissionData(missionData, havaBought)
data.missionId = missionData.missionId
data.shows = actRewardConfig[missionData.missionId].Reward
data.itemName = GetLanguageStrById(itemConfig[data.shows[1][1]].Name)
data.content = Language[10567] .. actRewardConfig[data.missionId].Values[1][2] .. Language[10568]
data.content = Language[10567] .. actRewardConfig[data.missionId].Values[1][2] --.. Language[10568]
data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2]
--0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取
if missionData.state == 0 then

View File

@ -355,11 +355,11 @@ function IncarnationPanel:SetSingleData(go, data, index)
NetManager.UpOrDownTransformationRequest(data.id, 0, 1, function()
data.state = 1
self:SetSingleData(go, data, index)
PopupTipPanel.ShowTip(string.format(Language[11623], data.name))
PopupTipPanel.ShowTip(string.format(Language[11623], GetLanguageStrById(data.name)))
CheckRedPointStatus(RedPointType.incarnation_force)
end)
else
PopupTipPanel.ShowTip(string.format(Language[11623], data.name))
PopupTipPanel.ShowTip(string.format(Language[11623], GetLanguageStrById(data.name)))
end
end)
Util.AddOnceClick(self.itemPreList[go].incarnationBtn, function()

View File

@ -181,7 +181,7 @@ function MonthCardPage:SetMonthCardTimes(i)
self.cardPres[i].time:SetActive(true)
local residueTimeNum = monthCardData.endingTime - GetTimeStamp()
local dayNum = math.floor(residueTimeNum / (24 * 3600))
self.cardPres[i].time:GetComponent("Text").text = Language[10579] .. dayNum .. Language[10017]
self.cardPres[i].time:GetComponent("Text").text = Language[10579].." " .. dayNum.." " .. Language[10017]
self.cardPres[i].time:SetActive(true)
else
self.cardPres[i].time:SetActive(false)

View File

@ -293,9 +293,9 @@ function this.RefreshWindowData()
this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true)
LogError("originalList[i]======================" .. originalList[i])
this.proGrid.transform:GetChild(i - 1):GetComponent("Text").text = proList[i] ..
string.format(Language[12733], math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100),
string.format(GetLanguageStrById(Language[12733]), math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100),
GiftManager.GetPlayerGiftAdd())
.. string.format(Language[12183], math.floor(originalList[i] * HeroManager.ReturnGiftAtt()),
.. string.format(GetLanguageStrById(Language[12183]), math.floor(originalList[i] * HeroManager.ReturnGiftAtt()),
HeroManager.ReturnGiftAtt())
elseif i == #proList then
this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true)