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

# Conflicts:
#	Assets/ManagedResources/ArtFont_en/chall_score_chuanshuo_en.png.meta
#	Assets/ManagedResources/ArtFont_en/chall_score_lianghao_en.png.meta
#	Assets/ManagedResources/ArtFont_en/chall_score_putong_en.png.meta
#	Assets/ManagedResources/ArtFont_en/chall_score_shenhua_en.png.meta
#	Assets/ManagedResources/ArtFont_en/chall_score_shishi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/chall_score_youxiu_en.png.meta
#	Assets/ManagedResources/ArtFont_en/gm_chouka_xxzm_title_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_chuanshuo_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_lianghao_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_putong_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_shenhua_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_shishi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/chall_score_youxiu_vi.png.meta
zhangjiannan 2024-11-22 15:00:03 +08:00
commit d390f3f455
48 changed files with 76907 additions and 13333 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 58f14b50af1ca744eb83f5378753ff7e
spriteID: 621eac6a9b8d36e468a38e5b29989e63
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2520a089882a2e54cb1444ec5339c11a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: lz4/prefabs/effect/floating/s_jieling_hs_3006_skeff_casting_buff_nuqi
assetBundleVariant: unity3d

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 928d0605582aea641b012aedae653fda
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: lz4/prefabs/effect/floating/s_jieling_hs_3006_skeff_casting_buff_nuqi
assetBundleVariant: unity3d

View File

@ -49286,8 +49286,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: -320.98108, y: 36.196938}
m_SizeDelta: {x: 160, y: 50}
m_AnchoredPosition: {x: -320.98108, y: 40.6}
m_SizeDelta: {x: 160, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222301608832697662
CanvasRenderer:
@ -69142,8 +69142,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: 307.9685, y: -79.59367}
m_SizeDelta: {x: 160, y: 50}
m_AnchoredPosition: {x: 307.9685, y: -73}
m_SizeDelta: {x: 160, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &832462977087574761
CanvasRenderer:

View File

@ -652,7 +652,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.1000061, y: -33.199997}
m_AnchoredPosition: {x: 0.1000061, y: -44}
m_SizeDelta: {x: 325, y: 55.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3833329087606336938
@ -2418,8 +2418,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: 6, y: 29.8}
m_SizeDelta: {x: 172, y: 44}
m_AnchoredPosition: {x: -1, y: 36}
m_SizeDelta: {x: 260, y: 95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1570570105998041136
CanvasRenderer:
@ -2469,10 +2469,10 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 70
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u63A8\u8350\u6218\u529B: "

View File

@ -2118,8 +2118,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: 221.89, y: 4.08}
m_SizeDelta: {x: 209.19, y: 79.05}
m_AnchoredPosition: {x: 191, y: 4.08}
m_SizeDelta: {x: 300, y: 79.05}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8407601103703489248
CanvasRenderer:

View File

@ -31082,7 +31082,7 @@ RectTransform:
m_GameObject: {fileID: 206795818901312588}
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_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_Children: []
m_Father: {fileID: 5808700343781995190}
m_RootOrder: 2
@ -31090,7 +31090,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -71.9, y: 106.7}
m_SizeDelta: {x: 63, y: 161}
m_SizeDelta: {x: 64, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3923436575020072497
CanvasRenderer:

View File

@ -1742,8 +1742,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: -44.6, y: -608.6}
m_SizeDelta: {x: 260, y: 74}
m_AnchoredPosition: {x: -42, y: -608.6}
m_SizeDelta: {x: 282.5, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4471614208094941950
CanvasRenderer:
@ -7269,7 +7269,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3953310609955344597
RectTransform:
m_ObjectHideFlags: 0
@ -13628,8 +13628,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: -71, y: 0}
m_SizeDelta: {x: 79.48, y: 65}
m_AnchoredPosition: {x: -86.04, y: 0}
m_SizeDelta: {x: 109.54, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4357818227745408231
CanvasRenderer:

View File

@ -5850,7 +5850,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1481527221269442438}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -36124,7 +36124,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1481527223222096654}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1

View File

@ -350,7 +350,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3}
m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4976,7 +4976,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3}
m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -15252,7 +15252,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3}
m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -31184,10 +31184,10 @@ RectTransform:
m_Father: {fileID: 6141158140942588348}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.4, y: -27.945}
m_SizeDelta: {x: 60.559998, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5312836045181016495
CanvasRenderer:
@ -31433,10 +31433,10 @@ RectTransform:
m_Father: {fileID: 6141158140942588348}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 94.84, y: -27.945}
m_SizeDelta: {x: 58.559998, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5312836045336955652
CanvasRenderer:
@ -32113,10 +32113,10 @@ RectTransform:
m_Father: {fileID: 6141158140942588348}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32.78, y: -27.945}
m_SizeDelta: {x: 65.56, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5312836045680264427
CanvasRenderer:
@ -61802,7 +61802,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: 6, y: 32}
m_AnchoredPosition: {x: 47, y: 32}
m_SizeDelta: {x: 500, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4364717930664956008
@ -61840,7 +61840,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -73720,22 +73720,22 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 517.6
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -197.05
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -73745,7 +73745,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -73755,7 +73755,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -73777,61 +73777,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 6789526059838717039}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3847535138429139909}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 3458715491590983735}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 3017694835917112368}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 6642769763838568755}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3138934397645299919}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5442704090709780514}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 2874966427381289844}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 8697078770617743630}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 7324771491079276774}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 6789526059838717039}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -73887,6 +73832,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 4239138255771575618}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 6789526059838717039}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3847535138429139909}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 3458715491590983735}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 3017694835917112368}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 6642769763838568755}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3138934397645299919}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5442704090709780514}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 2874966427381289844}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 8697078770617743630}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 7324771491079276774}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 6789526059838717039}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &6642769763838568755 stripped
@ -74067,22 +74067,22 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 717.6
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -197.05
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74092,7 +74092,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74102,7 +74102,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74124,61 +74124,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 7917258885034123966}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3246810435530417841}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 2024701814541766374}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 1875746557491206881}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 8055012424555673570}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3938731767263050251}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 2590766443349557498}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5351595982620730986}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 5428183252868327391}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6215016020277614135}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 7917258885034123966}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74234,6 +74179,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 662747332772281235}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 7917258885034123966}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 3246810435530417841}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 2024701814541766374}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 1875746557491206881}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 8055012424555673570}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 3938731767263050251}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 2590766443349557498}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 5351595982620730986}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 5428183252868327391}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6215016020277614135}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 7917258885034123966}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &1875746557491206881 stripped
@ -74408,22 +74408,22 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 317.59998
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -197.05
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74433,7 +74433,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74443,7 +74443,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -74465,6 +74465,11 @@ 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
@ -74475,66 +74480,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 7472164165561955869}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 931814734807593399}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5224851005951387662}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4832632607405404344}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 7324141232903758657}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 4378795258779545256}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 2997696272135148633}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 2192873659091441926}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4699914484981592956}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6642132831306302100}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 7472164165561955869}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74590,6 +74535,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 242976170226757424}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 7472164165561955869}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 931814734807593399}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 5224851005951387662}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 4832632607405404344}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 7324141232903758657}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 4378795258779545256}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 2997696272135148633}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 2192873659091441926}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 4699914484981592956}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 6642132831306302100}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 7472164165561955869}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &4378795258779545256 stripped

View File

@ -142,7 +142,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: -76}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2019625880
@ -227,7 +227,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 172.2002}
m_AnchoredPosition: {x: 0, y: 190}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2126607399
@ -307,7 +307,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: -773.3}
m_AnchoredPosition: {x: 0, y: -746}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &543350825205658828
@ -393,7 +393,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: 279, y: -167}
m_AnchoredPosition: {x: 279, y: -192}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9072643800475430328
@ -1582,7 +1582,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: -710.3}
m_AnchoredPosition: {x: 0, y: -681}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2913722661133017400

View File

@ -97855,8 +97855,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: 168.8, y: -90.628}
m_SizeDelta: {x: 125.4, y: 30.745}
m_AnchoredPosition: {x: 168.8, y: -88.7}
m_SizeDelta: {x: 125.4, y: 43.72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1280937550451923215
CanvasRenderer:
@ -98674,11 +98674,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -98689,6 +98684,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &5193385769038219363 stripped
@ -98914,11 +98914,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -98929,6 +98924,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &8990599829511114571 stripped
@ -99009,11 +99009,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99024,6 +99019,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &8203008183752308637 stripped
@ -99099,11 +99099,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99114,6 +99109,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &318771728336289081 stripped
@ -99189,11 +99189,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
@ -99204,6 +99199,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &327077116440716071 stripped

View File

@ -744,7 +744,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -0.000015258789, y: 0.59998703}
m_AnchoredPosition: {x: 0.000015258789, y: 0.59998703}
m_SizeDelta: {x: 0, y: 73.4}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7357140332678020418
@ -1113,8 +1113,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: -207.32, y: 90}
m_SizeDelta: {x: 225.36, y: 59.3}
m_AnchoredPosition: {x: -185, y: 86}
m_SizeDelta: {x: 180, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7747267131128849521
CanvasRenderer:
@ -1198,7 +1198,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -231}
m_SizeDelta: {x: 240, y: 80}
m_SizeDelta: {x: 310, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4037022011939362827
CanvasRenderer:
@ -1662,7 +1662,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -284}
m_SizeDelta: {x: 240, y: 80}
m_SizeDelta: {x: 310, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4220599613183303875
CanvasRenderer:
@ -2610,8 +2610,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.27, y: 90}
m_SizeDelta: {x: 219.26, y: 59.3}
m_AnchoredPosition: {x: -185, y: 86}
m_SizeDelta: {x: 180, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5009150299254546974
CanvasRenderer:
@ -3153,7 +3153,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -0.000015258789, y: 0.59998703}
m_AnchoredPosition: {x: 0.000015258789, y: 0.59998703}
m_SizeDelta: {x: 0, y: 73.4}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2468089333974702548

View File

@ -31381,7 +31381,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 20
m_MaxSize: 40
m_Alignment: 5
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -50246,7 +50246,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 20
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -52363,7 +52363,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 226, y: 44.5}
m_SizeDelta: {x: 226, y: 77.24}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6753592357789196717
CanvasRenderer:
@ -52400,7 +52400,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -2715,16 +2715,16 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 0
m_FontSize: 60
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 60
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 86685
--- !u!114 &2195797781509412881

View File

@ -1811,8 +1811,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: 276, y: 34}
m_SizeDelta: {x: 1000, y: 30}
m_AnchoredPosition: {x: 276, y: 31.84}
m_SizeDelta: {x: 1000, y: 72.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044902728451
CanvasRenderer:
@ -1844,11 +1844,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 0
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1

View File

@ -29848,8 +29848,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: 230.31985, y: -49.4}
m_SizeDelta: {x: 198.04, y: 63.46}
m_AnchoredPosition: {x: 241.38, y: -49.4}
m_SizeDelta: {x: 319.55, y: 63.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222314792653266900
CanvasRenderer:
@ -39654,7 +39654,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21.4, y: -0.30000305}
m_SizeDelta: {x: 292, y: 89}
m_SizeDelta: {x: 400, y: 89}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222797901123156212
CanvasRenderer:
@ -56110,8 +56110,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: -3.100029}
m_SizeDelta: {x: 361.52002, y: 100}
m_AnchoredPosition: {x: 27.6, y: -3.100029}
m_SizeDelta: {x: 416.8, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2729942992745642625
MonoBehaviour:
@ -58167,8 +58167,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: 111.7, y: -47.4}
m_SizeDelta: {x: 41, y: 40}
m_AnchoredPosition: {x: 48.4, y: -47.4}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5394178314422453918
CanvasRenderer:
@ -58853,7 +58853,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: 200.8, y: -6.8}
m_AnchoredPosition: {x: 184.9, y: -1.8}
m_SizeDelta: {x: 269.6, y: 55.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4654559960055660368
@ -58877,7 +58877,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9843137, g: 0.8862745, b: 0.6, a: 1}
m_Color: {r: 1, g: 0.9686275, b: 0.82745105, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -324,7 +324,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: -9.3, y: 139.2}
m_AnchoredPosition: {x: 38, y: 139.2}
m_SizeDelta: {x: 280, y: 78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222765991508291066
@ -2878,7 +2878,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.30004883, y: 139.2}
m_AnchoredPosition: {x: 38, y: 139.2}
m_SizeDelta: {x: 303, y: 77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7041719556531910036

View File

@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting_3006_zi_alpha_en
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: a884443cbea1b3c44a9cabc061217631, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: bd3946cfd8894c7419432e06e813eb7c
timeCreated: 1562749761
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting_3006_zi_alpha_vi
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 10fbfc541ad10ab4db6554dc196d51f0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: bf8d38bf5bb75ec48acd5ed4fffb72bf
timeCreated: 1562749761
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting_3006_zi_yz_add_en
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8a340084ed6a6ff4aa36d6f1bf45a9db, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 3b6779db32e8cc646895abd9d21faab5
timeCreated: 1562749787
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting_3006_zi_yz_add_vi
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 44c56fbbad7b31449b426f06a64f9efd, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 8b8f230464fb11543b7399dd50d07f85
timeCreated: 1562749787
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: a884443cbea1b3c44a9cabc061217631
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: caefd153746e93f49ad7a1613aa8c914
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 10fbfc541ad10ab4db6554dc196d51f0
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c2cffcaa6d5331a42a1dbdca560e4a7b
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -1,12 +1,12 @@
fileFormatVersion: 2
guid: 9089685470883fc4e933b8d0825db868
guid: 8a340084ed6a6ff4aa36d6f1bf45a9db
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
@ -51,35 +51,13 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
@ -91,13 +69,24 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a70a40de6deb7ce40a1fb241a4cb00a8
spriteID: ef7940b8ec6161141a7ed4d03f39341e
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 44c56fbbad7b31449b426f06a64f9efd
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 285c05a0c56a79345989d02310bfd479
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -2692,6 +2692,10 @@ end
function GetEquipSuitStr(Star, num)
-- return string.format("%s件%s%s星激活",num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars)
LogError(Language[13120])
LogError(num)
LogError(ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality)
LogError(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars)
return string.format(Language[13120], num,
QualityNameDef
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
@ -2803,6 +2807,10 @@ function SetEnglishActive(go)
end
function GetEquipSuitStr(Star, num)
LogError(Language[13120])
LogError(num)
LogError(ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality)
LogError(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars)
local qua = ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality
if qua == 8 then
qua = 7

View File

@ -287,12 +287,18 @@ function EnemyView:Update()
if self.rageCache ~= rage then
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local go = BattleManager.LoadAsset(rageEffect)
local switchEffect = rageEffect
if GetCurLanguage() == 1 then
switchEffect = switchEffect.."_en"
elseif GetCurLanguage() == 2 then
switchEffect = switchEffect.."_vi"
end
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go:SetActive(true)
BattleManager.AddDelayRecycleRes(rageEffect, go, 3)
BattleManager.AddDelayRecycleRes(switchEffect, go, 3)
end
self.effect_rage:SetActive(rage >= 1)

View File

@ -346,12 +346,18 @@ function PlayerView:Update()
if self.rageCache ~= rage then
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local go = BattleManager.LoadAsset(rageEffect)
local switchEffect = rageEffect
if GetCurLanguage() == 1 then
switchEffect = switchEffect.."_en"
elseif GetCurLanguage() == 2 then
switchEffect = switchEffect.."_vi"
end
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go:SetActive(true)
BattleManager.AddDelayRecycleRes(rageEffect, go, 3)
BattleManager.AddDelayRecycleRes(switchEffect, go, 3)
end
self.effect_rage:SetActive(rage >= 1)

View File

@ -268,12 +268,18 @@ function RoleView:Update()
if self.rageCache ~= rage then
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local go = BattleManager.LoadAsset(rageEffect)
local switchEffect = rageEffect
if GetCurLanguage() == 1 then
switchEffect = switchEffect.."_en"
elseif GetCurLanguage() == 2 then
switchEffect = switchEffect.."_vi"
end
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
go:SetActive(true)
BattleManager.AddDelayRecycleRes(rageEffect, go, 3)
BattleManager.AddDelayRecycleRes(switchEffect, go, 3)
end
self.effect_rage:SetActive(rage >= 1)

View File

@ -28,7 +28,9 @@ local TipConfig = {
},
[MoneyType.USD] = {
[1] = "s_shouchong_$1_zh",
[2] = "s_shouchong_15_zh"
[2] = "s_shouchong_15_zh",
[3] = "s_shouchong_$1_zh",
[4] = "s_shouchong_15_zh"
},
[MoneyType.RMB] = {
[1] = "s_shouchong_anniuzi6_zh",