替换MergeOrderItem
This commit is contained in:
zhang hongbo
parent
42f6460690
commit
e68c4d65ea
@ -2350,6 +2350,7 @@ MonoBehaviour:
|
||||
CatReturnBtn: {fileID: 0}
|
||||
order_left_gap: 0
|
||||
MergeItemPrefab: {fileID: 2702038070474672571, guid: 0885024ef63c0c3429e1b329c100012f, type: 3}
|
||||
MergeOrderItemPrefab: {fileID: 5594218438122169047, guid: e769e16062c2fb0459f1ce5757a4842b, type: 3}
|
||||
FriendBubbleItemPrefab: {fileID: 0}
|
||||
ConsumeOrderBoxPosList: []
|
||||
MergeBubbleList: []
|
||||
|
||||
@ -508,7 +508,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6614655690572624973
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1247,7 +1247,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &684725380783513234
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1453,7 +1453,7 @@ MonoBehaviour:
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 0
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
@ -1499,7 +1499,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7797353615660991632
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1588,7 +1588,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2197672497884000580
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1666,7 +1666,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8197051765932577297
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2468,6 +2468,159 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3131814324297716928
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 480875389655024266}
|
||||
- component: {fileID: 7311399937642008379}
|
||||
- component: {fileID: 1797632800693301700}
|
||||
- component: {fileID: 6214541146169098004}
|
||||
- component: {fileID: 1747513827504430156}
|
||||
m_Layer: 0
|
||||
m_Name: kaihua_sg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &480875389655024266
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3131814324297716928}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1550321291304069922}
|
||||
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: -105, y: 0}
|
||||
m_SizeDelta: {x: 350, y: 420}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &7311399937642008379
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3131814324297716928}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1797632800693301700
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3131814324297716928}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
initialSkinName:
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation: Flowers
|
||||
startingLoop: 0
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
updateWhenInvisible: 3
|
||||
unscaledTime: 0
|
||||
allowMultipleCanvasRenderers: 0
|
||||
canvasRenderers: []
|
||||
separatorSlotNames: []
|
||||
enableSeparatorSlots: 0
|
||||
separatorParts: []
|
||||
updateSeparatorPartLocation: 1
|
||||
meshGenerator:
|
||||
settings:
|
||||
useClipping: 1
|
||||
zSpacing: 0
|
||||
pmaVertexColors: 1
|
||||
tintBlack: 0
|
||||
canvasGroupTintBlack: 0
|
||||
calculateTangents: 0
|
||||
addNormals: 0
|
||||
immutableTriangles: 0
|
||||
--- !u!114 &6214541146169098004
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3131814324297716928}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 0
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1797632800693301700}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1747513827504430156
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3131814324297716928}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 44ee9be70023ffb44b3675c769a2a429, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ColorNoChange: 0
|
||||
IsSqueezeDown: 0
|
||||
IsEffectOperate: 1
|
||||
BindGos: []
|
||||
--- !u!1 &3199405801437517444
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2681,7 +2834,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 5b75ed15397208f4f9f1028c0c5e9526, type: 2}
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
initialSkinName:
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
@ -3084,7 +3237,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: -80, y: 41.66504}
|
||||
m_AnchoredPosition: {x: -103, y: 35}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1483623993611624415
|
||||
@ -3789,7 +3942,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6485944729306651098
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3973,7 +4126,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: -40, y: -180}
|
||||
m_AnchoredPosition: {x: -70, y: -180}
|
||||
m_SizeDelta: {x: 350, y: 420}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &2363907089505848710
|
||||
@ -4004,7 +4157,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
skeletonDataAsset: {fileID: 11400000, guid: c1b3a1c51009a2a4783fd1ee24e5dcad, type: 2}
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
initialSkinName:
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
@ -4772,7 +4925,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -49, y: 1}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_SizeDelta: {x: 83, y: 83}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1051956733389961722
|
||||
CanvasRenderer:
|
||||
@ -4845,6 +4998,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 553417048102546938}
|
||||
- {fileID: 3552639679738897196}
|
||||
- {fileID: 480875389655024266}
|
||||
- {fileID: 2875650897714449964}
|
||||
- {fileID: 4267977731976583614}
|
||||
- {fileID: 4841280473746968720}
|
||||
@ -4912,6 +5066,7 @@ MonoBehaviour:
|
||||
finish_count: 0
|
||||
IsFinish: 0
|
||||
IsShowFinishScaleEffect: 0
|
||||
role_key:
|
||||
--- !u!1 &5617089455449694109
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5618,7 +5773,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3614728725035781474
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5747,7 +5902,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4841280473746968720
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6076,8 +6231,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: 10, y: 2.5}
|
||||
m_SizeDelta: {x: -60, y: -45}
|
||||
m_AnchoredPosition: {x: 12.5, y: 2.5}
|
||||
m_SizeDelta: {x: -65, y: -45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5897422353147543374
|
||||
CanvasRenderer:
|
||||
@ -6107,7 +6262,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u52A0\u6CB9\uFF0C\u8FD8\u5DEE3\u4E2A\u5BA0\u7269\u5E01\u5C31\u80FD\u7ED9\u5C0F\u732B\u751F\u706B\u4E86\uFF01"
|
||||
m_text: Let's have a cup of coffee together after you're done.
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2}
|
||||
m_sharedMaterial: {fileID: -6186801479491972736, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2}
|
||||
@ -6117,7 +6272,7 @@ MonoBehaviour:
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281486988
|
||||
m_fontColor: {r: 0.54901963, g: 0.30588236, b: 0.19607843, a: 1}
|
||||
m_fontColor: {r: 0.54901963, g: 0.29803923, b: 0.19607843, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -6146,7 +6301,7 @@ MonoBehaviour:
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 30
|
||||
m_lineSpacing: 20
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
@ -6352,7 +6507,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5411073363916076084
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7161,7 +7316,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
skeletonDataAsset: {fileID: 11400000, guid: a47b0425540d3b04a90cd05ff1717972, type: 2}
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
initialSkinName:
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
|
||||
@ -89596,6 +89596,7 @@ MonoBehaviour:
|
||||
Dialog_Pos: {x: 0, y: 0, z: 0}
|
||||
OpenSpecialType:
|
||||
MergeItemPrefab: {fileID: 2702038070474672571, guid: 0885024ef63c0c3429e1b329c100012f, type: 3}
|
||||
MergeOrderItemPrefab: {fileID: 5594218438122169047, guid: e769e16062c2fb0459f1ce5757a4842b, type: 3}
|
||||
PolieItemPrefab: {fileID: 0}
|
||||
ShopDiamondItemPrefab: {fileID: 0}
|
||||
ShopEnergyItemPrefab: {fileID: 0}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user