Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
This commit is contained in:
xiekaidong
commit
942edff496
@ -817,6 +817,7 @@ GameObject:
|
||||
- component: {fileID: 1910530006350166380}
|
||||
- component: {fileID: 7547879227366158704}
|
||||
- component: {fileID: 4375082134509131366}
|
||||
- component: {fileID: 2094661858602565296}
|
||||
m_Layer: 0
|
||||
m_Name: buff_4
|
||||
m_TagString: Untagged
|
||||
@ -865,7 +866,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -881,6 +882,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &2094661858602565296
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 882627564803913821}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &995533560154852757
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2401,6 +2415,7 @@ GameObject:
|
||||
- component: {fileID: 3839697996577223464}
|
||||
- component: {fileID: 1709275559741671049}
|
||||
- component: {fileID: 4492851657903992535}
|
||||
- component: {fileID: 8925145558737739381}
|
||||
m_Layer: 0
|
||||
m_Name: buff_5
|
||||
m_TagString: Untagged
|
||||
@ -2449,7 +2464,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -2465,6 +2480,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8925145558737739381
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3028938803098778621}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &3230621245398519833
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2660,6 +2688,7 @@ GameObject:
|
||||
- component: {fileID: 808028389491998827}
|
||||
- component: {fileID: 6512579025471450385}
|
||||
- component: {fileID: 7378863657019224217}
|
||||
- component: {fileID: 2450422876465716226}
|
||||
m_Layer: 0
|
||||
m_Name: buff_2
|
||||
m_TagString: Untagged
|
||||
@ -2708,7 +2737,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -2724,6 +2753,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &2450422876465716226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3525695116899312544}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &3919187627067218253
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2824,6 +2866,7 @@ GameObject:
|
||||
- component: {fileID: 7502828936155024182}
|
||||
- component: {fileID: 7788219249870309538}
|
||||
- component: {fileID: 5680167312640910212}
|
||||
- component: {fileID: 8967740336696551494}
|
||||
m_Layer: 0
|
||||
m_Name: buff_1
|
||||
m_TagString: Untagged
|
||||
@ -2872,7 +2915,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -2888,6 +2931,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8967740336696551494
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4055292833890906260}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &4164635855224637439
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3477,6 +3533,7 @@ GameObject:
|
||||
- component: {fileID: 844352230494335280}
|
||||
- component: {fileID: 1541558071992128539}
|
||||
- component: {fileID: 1717276050839923523}
|
||||
- component: {fileID: 5827777598743260308}
|
||||
m_Layer: 0
|
||||
m_Name: buff_1
|
||||
m_TagString: Untagged
|
||||
@ -3525,7 +3582,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -3541,6 +3598,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &5827777598743260308
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4815333936642822683}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &4854112511481542388
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4015,6 +4085,7 @@ GameObject:
|
||||
- component: {fileID: 2125269189614622357}
|
||||
- component: {fileID: 3467060916207783957}
|
||||
- component: {fileID: 6587852919292432341}
|
||||
- component: {fileID: 86765112277407468}
|
||||
m_Layer: 0
|
||||
m_Name: buff_4
|
||||
m_TagString: Untagged
|
||||
@ -4063,7 +4134,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -4079,6 +4150,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &86765112277407468
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5608342323733900253}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &5648045933572433183
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4412,6 +4496,7 @@ GameObject:
|
||||
- component: {fileID: 7716270423116454429}
|
||||
- component: {fileID: 2234664931218595796}
|
||||
- component: {fileID: 1118336192869578312}
|
||||
- component: {fileID: 518365725257461791}
|
||||
m_Layer: 0
|
||||
m_Name: buff_3
|
||||
m_TagString: Untagged
|
||||
@ -4460,7 +4545,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -4476,6 +4561,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &518365725257461791
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6020894829852600390}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &6042468574734283768
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5344,6 +5442,7 @@ GameObject:
|
||||
- component: {fileID: 9124615352290999652}
|
||||
- component: {fileID: 2698990218900212798}
|
||||
- component: {fileID: 1599119794561479428}
|
||||
- component: {fileID: 8046099337682077276}
|
||||
m_Layer: 0
|
||||
m_Name: buff_3
|
||||
m_TagString: Untagged
|
||||
@ -5392,7 +5491,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -5408,6 +5507,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8046099337682077276
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7114213473755422741}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &7213446635461355197
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5419,6 +5531,7 @@ GameObject:
|
||||
- component: {fileID: 9201843802381376671}
|
||||
- component: {fileID: 8164043872394120959}
|
||||
- component: {fileID: 4877666903270305401}
|
||||
- component: {fileID: 1742219101685981696}
|
||||
m_Layer: 0
|
||||
m_Name: buff_2
|
||||
m_TagString: Untagged
|
||||
@ -5467,7 +5580,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -5483,6 +5596,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &1742219101685981696
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7213446635461355197}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &7215588411953724065
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6731,6 +6857,7 @@ GameObject:
|
||||
- component: {fileID: 7626716059529482915}
|
||||
- component: {fileID: 1376543513515145666}
|
||||
- component: {fileID: 1242124625918030282}
|
||||
- component: {fileID: 7095471865865256228}
|
||||
m_Layer: 0
|
||||
m_Name: buff_5
|
||||
m_TagString: Untagged
|
||||
@ -6779,7 +6906,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -6795,6 +6922,19 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7095471865865256228
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8727449664879014232}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsShowClickAnimation: 0
|
||||
--- !u!1 &8889665677046596496
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7958,16 +8098,16 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
|
||||
--- !u!1 &7746559084762877130 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
|
||||
m_PrefabInstance: {fileID: 6281625263577488710}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1699757838083181343 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
|
||||
m_PrefabInstance: {fileID: 6281625263577488710}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7746559084762877130 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
|
||||
m_PrefabInstance: {fileID: 6281625263577488710}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7292576075314493597
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user