Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-09-02 14:19:20 +08:00
commit 8c8697d31d
4 changed files with 85 additions and 85 deletions

View File

@ -228,9 +228,9 @@ RectTransform:
m_Father: {fileID: 1787225928} m_Father: {fileID: 1787225928}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 960, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 1080} m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &136085601 --- !u!1 &136085601
@ -15424,9 +15424,9 @@ RectTransform:
m_Father: {fileID: 1787225928} m_Father: {fileID: 1787225928}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -996, y: -66} m_AnchoredPosition: {x: -36, y: -66}
m_SizeDelta: {x: 1920, y: 1080} m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &660142687 --- !u!1 &660142687

View File

@ -177,17 +177,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116568384821104400} m_GameObject: {fileID: 116568384821104400}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 3827837348353787349} - {fileID: 3827837348353787349}
m_Father: {fileID: 2722594216782806536} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 455.09998, y: 599.6} m_AnchoredPosition: {x: -85.110016, y: -374.79504}
m_SizeDelta: {x: 129, y: 126} m_SizeDelta: {x: 129, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &767217279474302783 --- !u!222 &767217279474302783
@ -686,7 +686,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3634, y: 482} m_AnchoredPosition: {x: -1937, y: 427}
m_SizeDelta: {x: 1080, y: 240} m_SizeDelta: {x: 1080, y: 240}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3194347943538256385 --- !u!222 &3194347943538256385
@ -1151,16 +1151,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 347287572977430676} m_GameObject: {fileID: 347287572977430676}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2722594216782806536} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 454.21, y: 856.395} m_AnchoredPosition: {x: -86, y: -118}
m_SizeDelta: {x: 71.6, y: 69.93} m_SizeDelta: {x: 71.6, y: 69.93}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4203910197848605498 --- !u!222 &4203910197848605498
@ -4023,10 +4023,10 @@ RectTransform:
m_Father: {fileID: 9221269647570633331} m_Father: {fileID: 9221269647570633331}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1519642980827618702 --- !u!1 &1519642980827618702
GameObject: GameObject:
@ -6821,7 +6821,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -221, y: -8} m_AnchoredPosition: {x: -163, y: -8}
m_SizeDelta: {x: 556, y: 140} m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2773980373717958241 --- !u!1 &2773980373717958241
@ -6982,7 +6982,7 @@ RectTransform:
- {fileID: 2963800615927287734} - {fileID: 2963800615927287734}
- {fileID: 8939153194868361019} - {fileID: 8939153194868361019}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 3 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -7180,7 +7180,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.00007247925} m_AnchoredPosition: {x: 0.00010159275, y: 0.00007247925}
m_SizeDelta: {x: 556, y: 140} m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8630182237039308045 --- !u!114 &8630182237039308045
@ -7398,8 +7398,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 17.74, y: 81.5} m_AnchoredPosition: {x: 489.1, y: 81.5}
m_SizeDelta: {x: 558, y: 44} m_SizeDelta: {x: 1029.4, y: 44}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!222 &8729821525442469488 --- !u!222 &8729821525442469488
CanvasRenderer: CanvasRenderer:
@ -12784,7 +12784,7 @@ ParticleSystem:
--- !u!199 &6361814840690037554 --- !u!199 &6361814840690037554
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -13003,7 +13003,7 @@ RectTransform:
- {fileID: 9183942328723741465} - {fileID: 9183942328723741465}
- {fileID: 2883850083648071571} - {fileID: 2883850083648071571}
m_Father: {fileID: 2722594216782806536} m_Father: {fileID: 2722594216782806536}
m_RootOrder: 3 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -14106,6 +14106,9 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 773134491157311162} - {fileID: 773134491157311162}
- {fileID: 1008277262461928353}
- {fileID: 1314800149254738902}
- {fileID: 3718220382011998832}
- {fileID: 2722594216782806536} - {fileID: 2722594216782806536}
- {fileID: 3007509630249697043} - {fileID: 3007509630249697043}
- {fileID: 883054594287310539} - {fileID: 883054594287310539}
@ -15401,17 +15404,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4254212552365417261} m_GameObject: {fileID: 4254212552365417261}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8207362308005532470} - {fileID: 8207362308005532470}
m_Father: {fileID: 2722594216782806536} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 455.09998, y: 743.2} m_AnchoredPosition: {x: -85.110016, y: -231.19507}
m_SizeDelta: {x: 129, y: 126} m_SizeDelta: {x: 129, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4818370994550726432 --- !u!222 &4818370994550726432
@ -16062,7 +16065,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1690, y: 529.56} m_AnchoredPosition: {x: -2359, y: 352}
m_SizeDelta: {x: 1080, y: 192.67} m_SizeDelta: {x: 1080, y: 192.67}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4453678039707639172 --- !u!1 &4453678039707639172
@ -16268,7 +16271,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -221, y: -8} m_AnchoredPosition: {x: -157, y: -8}
m_SizeDelta: {x: 556, y: 140} m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4506435573488544155 --- !u!1 &4506435573488544155
@ -16719,11 +16722,11 @@ RectTransform:
- {fileID: 465935887283869462} - {fileID: 465935887283869462}
- {fileID: 7882635905004894073} - {fileID: 7882635905004894073}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 5 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 186, y: 762.5} m_AnchoredPosition: {x: 169.6, y: -219}
m_SizeDelta: {x: 372, y: 128} m_SizeDelta: {x: 372, y: 128}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3027286635382684003 --- !u!222 &3027286635382684003
@ -17770,7 +17773,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 2 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -18070,9 +18073,9 @@ RectTransform:
m_Father: {fileID: 4364234898477055512} m_Father: {fileID: 4364234898477055512}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 451, y: 856} m_AnchoredPosition: {x: -89, y: -104}
m_SizeDelta: {x: 68, y: 68} m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6458068161437357534 --- !u!222 &6458068161437357534
@ -18412,10 +18415,10 @@ RectTransform:
m_Father: {fileID: 4364234898477055512} m_Father: {fileID: 4364234898477055512}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -228.24, y: 853.51} m_AnchoredPosition: {x: 311.76, y: -106.48999}
m_SizeDelta: {x: 625.72, y: 56.37} m_SizeDelta: {x: 625.72, y: 56.369995}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7766466812159411362 --- !u!222 &7766466812159411362
CanvasRenderer: CanvasRenderer:
@ -18488,7 +18491,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -198.1, y: 34} m_AnchoredPosition: {x: -138, y: 34}
m_SizeDelta: {x: 300, y: 50} m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &992739101051798407 --- !u!222 &992739101051798407
@ -23105,7 +23108,7 @@ ParticleSystem:
--- !u!199 &56297470826831929 --- !u!199 &56297470826831929
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -25127,9 +25130,9 @@ RectTransform:
m_Father: {fileID: 506102326830138150} m_Father: {fileID: 506102326830138150}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 415.9, y: 171} m_AnchoredPosition: {x: 365.9, y: 171}
m_SizeDelta: {x: 220, y: 260} m_SizeDelta: {x: 220, y: 260}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5531975551149570497 --- !u!222 &5531975551149570497
@ -27599,7 +27602,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -538.24, y: 82} m_AnchoredPosition: {x: -455, y: 82}
m_SizeDelta: {x: 443, y: 50} m_SizeDelta: {x: 443, y: 50}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4232190997202796534 --- !u!114 &4232190997202796534
@ -27822,7 +27825,7 @@ RectTransform:
- {fileID: 879772913056491833} - {fileID: 879772913056491833}
- {fileID: 6751057454219076664} - {fileID: 6751057454219076664}
m_Father: {fileID: 2722594216782806536} m_Father: {fileID: 2722594216782806536}
m_RootOrder: 4 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -28530,7 +28533,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2686, y: 369} m_AnchoredPosition: {x: -1996, y: 369}
m_SizeDelta: {x: 1080, y: 240} m_SizeDelta: {x: 1080, y: 240}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &952584959393060940 --- !u!222 &952584959393060940
@ -28774,7 +28777,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6224, y: -61} m_AnchoredPosition: {x: -2308, y: -61}
m_SizeDelta: {x: 1080, y: 239.5} m_SizeDelta: {x: 1080, y: 239.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7170134193974468110 --- !u!222 &7170134193974468110
@ -29380,11 +29383,11 @@ RectTransform:
m_Children: m_Children:
- {fileID: 7003305966459268540} - {fileID: 7003305966459268540}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 4 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -283.51, y: 854.77} m_AnchoredPosition: {x: 256.3, y: -110.8}
m_SizeDelta: {x: 512.98, y: 56.54} m_SizeDelta: {x: 512.98, y: 56.54}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &416997990947242882 --- !u!222 &416997990947242882
@ -30213,13 +30216,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1008277262461928353}
- {fileID: 1314800149254738902}
- {fileID: 3718220382011998832}
- {fileID: 1581354851230907343} - {fileID: 1581354851230907343}
- {fileID: 5695208878278333687} - {fileID: 5695208878278333687}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 1 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -30495,7 +30495,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -221, y: -42.7} m_AnchoredPosition: {x: -137.76003, y: -42.7}
m_SizeDelta: {x: 556, y: 140} m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8980831459057202516 --- !u!114 &8980831459057202516
@ -30860,9 +30860,9 @@ RectTransform:
m_Father: {fileID: 506102326830138150} m_Father: {fileID: 506102326830138150}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -431.7, y: 93} m_AnchoredPosition: {x: -381.7, y: 93}
m_SizeDelta: {x: 205, y: 240} m_SizeDelta: {x: 205, y: 240}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8918498995335539330 --- !u!222 &8918498995335539330
@ -31015,7 +31015,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39.66667, y: -38.17} m_AnchoredPosition: {x: 39.666668, y: -38.17}
m_SizeDelta: {x: 69, y: 100} m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4102564784388293894 --- !u!222 &4102564784388293894
@ -31917,7 +31917,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.000015348598, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &8625427577928505908 --- !u!114 &8625427577928505908
@ -32659,7 +32659,7 @@ RectTransform:
- {fileID: 4469665290745153394} - {fileID: 4469665290745153394}
- {fileID: 5927925275640263573} - {fileID: 5927925275640263573}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 6 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -33511,7 +33511,7 @@ RectTransform:
- {fileID: 9090665407810356215} - {fileID: 9090665407810356215}
- {fileID: 94963989306285979} - {fileID: 94963989306285979}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 8 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -33551,7 +33551,7 @@ RectTransform:
- {fileID: 2687333387702614192} - {fileID: 2687333387702614192}
- {fileID: 3099733531300769714} - {fileID: 3099733531300769714}
m_Father: {fileID: 3463243519653302739} m_Father: {fileID: 3463243519653302739}
m_RootOrder: 7 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -35499,10 +35499,10 @@ RectTransform:
m_Father: {fileID: 4364234898477055512} m_Father: {fileID: 4364234898477055512}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: -980, y: -1820}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8970812547111512746 --- !u!1 &8970812547111512746
GameObject: GameObject:
@ -36411,7 +36411,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -198.1, y: -30.4} m_AnchoredPosition: {x: -138, y: -30.4}
m_SizeDelta: {x: 300, y: 64.77} m_SizeDelta: {x: 300, y: 64.77}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6144654468638633574 --- !u!222 &6144654468638633574
@ -36488,7 +36488,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -440.8, y: 4.4} m_AnchoredPosition: {x: -380.69998, y: 4.4}
m_SizeDelta: {x: 132.4, y: 121.6} m_SizeDelta: {x: 132.4, y: 121.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9198227127222798050 --- !u!1 &9198227127222798050

View File

@ -16,7 +16,7 @@ local bType={
--type与lotterySetting表中的id对应 --type与lotterySetting表中的id对应
local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644],type=RecruitType.TimeLimitSingle}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182],type=RecruitType.TimeLimitTen}} local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644],type=RecruitType.TimeLimitSingle}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182],type=RecruitType.TimeLimitTen}}
local tabs={"btngroup/activity","btngroup/reward"} local tabs={"activity","reward"}
local secectTab=-1 local secectTab=-1
@ -32,10 +32,10 @@ function TimeLimitedCall:ctor(mainPanel, gameObject)
end end
function TimeLimitedCall:InitComponent(gameObject) function TimeLimitedCall:InitComponent(gameObject)
self.helpBtn = Util.GetGameObject(self.gameObject,"btngroup/help") self.helpBtn = Util.GetGameObject(self.gameObject,"help")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.activityBtn = Util.GetGameObject(self.gameObject,"btngroup/activity") self.activityBtn = Util.GetGameObject(self.gameObject,"activity")
self.rewardBtn = Util.GetGameObject(self.gameObject,"btngroup/reward") self.rewardBtn = Util.GetGameObject(self.gameObject,"reward")
self.rewardBtn:SetActive(false)--(暂时关闭) self.rewardBtn:SetActive(false)--(暂时关闭)
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间 self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间
self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限 self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限

View File

@ -26,7 +26,7 @@ this.MapSpeed = 0
this.MapView = 0 this.MapView = 0
this.IsGetFiveStarHero = false this.IsGetFiveStarHero = false
this.headBookListTag = 0 this.headBookListTag = 1
local update = function() local update = function()
local dt = Time.unscaledDeltaTime local dt = Time.unscaledDeltaTime
this.serverTime = this.serverTime + dt this.serverTime = this.serverTime + dt