Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
wangzhenxing 2021-11-27 15:15:00 +08:00
commit d639b2d29b
2 changed files with 83 additions and 0 deletions

View File

@ -20217,6 +20217,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9064487652359765220}
- component: {fileID: 6459981445507199720}
- component: {fileID: 1675526259212335121}
m_Layer: 5
m_Name: UpRoot
m_TagString: Untagged
@ -20252,6 +20254,44 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &6459981445507199720
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: -5085283458129937629}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &1675526259212335121
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: -5085283458129937629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &-4807420432356683768
GameObject:
m_ObjectHideFlags: 0
@ -210790,6 +210830,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4865351776209694286}
- component: {fileID: 1385466346284873830}
- component: {fileID: 2938771871600306146}
m_Layer: 5
m_Name: DownRoot
m_TagString: Untagged
@ -210821,6 +210863,44 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &1385466346284873830
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8019695460055775128}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &2938771871600306146
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8019695460055775128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &8114854227839379780
GameObject:
m_ObjectHideFlags: 0

View File

@ -223,6 +223,9 @@ function this:OnSortingOrderChange()
orginLayer = this.sortingOrder
BattleView:OnSortingOrderChange(this.sortingOrder)
this.UpRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
this.DownRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
end
function this:IsBossFight(fightType)