Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
This commit is contained in:
chenxi
commit
9c2d1e7599
Binary file not shown.
Binary file not shown.
@ -193,6 +193,140 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &976367606797475107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6268640985721502814}
|
||||
- component: {fileID: 6993098091646174510}
|
||||
- component: {fileID: 8298841482340756204}
|
||||
m_Layer: 0
|
||||
m_Name: desc
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6268640985721502814
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976367606797475107}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2201361965658472264}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -27.9}
|
||||
m_SizeDelta: {x: 100, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6993098091646174510
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976367606797475107}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8298841482340756204
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976367606797475107}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 0
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &1319319466675763640
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -711,7 +845,8 @@ RectTransform:
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 2201361965658472264}
|
||||
m_Father: {fileID: 525532066576820098}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1586,6 +1721,82 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 1
|
||||
--- !u!1 &6658417554400897687
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2201361965658472264}
|
||||
- component: {fileID: 485153474499989521}
|
||||
- component: {fileID: 5013109117941602667}
|
||||
m_Layer: 0
|
||||
m_Name: mystery_box_icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2201361965658472264
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6658417554400897687}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 6268640985721502814}
|
||||
m_Father: {fileID: 4087422622006778137}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -144, y: 129}
|
||||
m_SizeDelta: {x: 64, y: 55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &485153474499989521
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6658417554400897687}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5013109117941602667
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6658417554400897687}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6830755455959825909
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2559,6 +2770,14 @@ MonoBehaviour:
|
||||
hashName: 3376984312
|
||||
objectType: 0
|
||||
gameObject: {fileID: 7978622507837727525}
|
||||
- name: main_comp.chapter.img.mystery_box_icon
|
||||
hashName: 3921719474
|
||||
objectType: 0
|
||||
gameObject: {fileID: 6658417554400897687}
|
||||
- name: main_comp.chapter.img.mystery_box_icon.desc
|
||||
hashName: 3047368269
|
||||
objectType: 0
|
||||
gameObject: {fileID: 976367606797475107}
|
||||
--- !u!114 &6214590949040345325
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2869,16 +3088,16 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
--- !u!1 &2254130738374009137 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 354835069707619401}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &3178344294329280471 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 354835069707619401}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2254130738374009137 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 354835069707619401}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2921257277667212657
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2988,16 +3207,16 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
|
||||
--- !u!224 &805175569456205093 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
|
||||
m_PrefabInstance: {fileID: 2921257277667212657}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8480415467563264251 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
|
||||
m_PrefabInstance: {fileID: 2921257277667212657}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &805175569456205093 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
|
||||
m_PrefabInstance: {fileID: 2921257277667212657}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3384319494706504071
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3099,16 +3318,16 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
--- !u!224 &432516470351448601 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3384319494706504071}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3842524640567971071 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3384319494706504071}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &432516470351448601 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3384319494706504071}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3732174623407794182
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3210,16 +3429,16 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
--- !u!1 &2913756806983878014 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3732174623407794182}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1962521455536505752 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3732174623407794182}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2913756806983878014 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
|
||||
m_PrefabInstance: {fileID: 3732174623407794182}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4913800057335080765
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user