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

yuanshuai 2022-11-15 16:35:55 +08:00
commit a04fb2ac2f
17 changed files with 538 additions and 37 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 99 KiB

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 12, z: 0, w: 169}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 9, z: 0, w: 169}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -30,12 +30,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6616730211952462317}
m_RootOrder: 1
m_RootOrder: 2
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: 241.15002, y: -76}
m_SizeDelta: {x: 514.3, y: 47.2}
m_AnchoredPosition: {x: 11.4, y: -95.208084}
m_SizeDelta: {x: 1037.5, y: 105.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2736126529659177549
CanvasRenderer:
@ -67,11 +67,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 34
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 34
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -374,8 +374,8 @@ 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: 241, y: 10}
m_SizeDelta: {x: 548, y: 232}
m_AnchoredPosition: {x: 241, y: 36.7}
m_SizeDelta: {x: 548, y: 178.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &762176676406241237
CanvasRenderer:
@ -405,8 +405,8 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 3a78e287e0553424791f579f79c2eff0, type: 3}
m_Type: 0
m_Sprite: {fileID: 21300000, guid: 7426537e68ca72644b96bd16a8f9da01, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -2237,6 +2237,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2809572546770804754}
- {fileID: 1202519692196597791}
- {fileID: 1365847374173356250}
m_Father: {fileID: 3233073780574710381}
m_RootOrder: 1
@ -2283,6 +2284,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6672120482623094351
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1202519692196597791}
- component: {fileID: 7916824354769180476}
- component: {fileID: 2785184917415133326}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1202519692196597791
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6672120482623094351}
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: 6616730211952462317}
m_RootOrder: 1
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: 34.8, y: -99.728}
m_SizeDelta: {x: 1389.4, y: 120.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7916824354769180476
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6672120482623094351}
m_CullTransparentMesh: 0
--- !u!114 &2785184917415133326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6672120482623094351}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7735849, g: 0.61980623, b: 0.46342114, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ffd3194aa6bc1134f87a8a6a112d5b37, 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
--- !u!1 &6981790837300441059
GameObject:
m_ObjectHideFlags: 0

View File

@ -145,6 +145,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1820718257822173687}
- {fileID: 8174691545454135507}
- {fileID: 3597293914897812886}
- {fileID: 7664187428545557434}
@ -463,6 +464,53 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &566866127944547337
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1820718257822173687}
- component: {fileID: 682159529315701993}
m_Layer: 5
m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1820718257822173687
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566866127944547337}
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: 6893026086784897140}
- {fileID: 996536539065158426}
- {fileID: 7358646842554356004}
m_Father: {fileID: 1792764959241262439}
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: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &682159529315701993
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566866127944547337}
m_CullTransparentMesh: 0
--- !u!1 &742306660034555430
GameObject:
m_ObjectHideFlags: 0
@ -5770,6 +5818,7 @@ RectTransform:
- {fileID: 3826093032240713913}
- {fileID: 3512704310149506704}
- {fileID: 4708614719849942965}
- {fileID: 2210074410557156002}
m_Father: {fileID: 8772735742504336993}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5888,7 +5937,7 @@ RectTransform:
m_Children:
- {fileID: 8472295107157176270}
m_Father: {fileID: 1792764959241262439}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5967,7 +6016,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: -269.5, y: -521}
m_AnchoredPosition: {x: -269.5, y: -430}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3840635568929308425
@ -6580,7 +6629,7 @@ RectTransform:
- {fileID: 8378124066126775923}
- {fileID: 391955313055842024}
m_Father: {fileID: 1792764959241262439}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -6602,7 +6651,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3428593359095076002}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -6698,6 +6747,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3683460160705340515
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7358646842554356004}
- component: {fileID: 568557614017533568}
- component: {fileID: 2740781502714485269}
m_Layer: 5
m_Name: Bg2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7358646842554356004
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3683460160705340515}
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: 1820718257822173687}
m_RootOrder: 2
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: -8.8, y: 283.69995}
m_SizeDelta: {x: 833, y: 834}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &568557614017533568
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3683460160705340515}
m_CullTransparentMesh: 0
--- !u!114 &2740781502714485269
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3683460160705340515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d810b87ac7a57d44f93dfb73006cfc41, 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
--- !u!1 &3772299510285832107
GameObject:
m_ObjectHideFlags: 0
@ -7003,7 +7126,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 91}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &289963460829507102
@ -7021,7 +7144,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 31
m_Top: 147
m_Top: 250
m_Bottom: 0
m_ChildAlignment: 2
m_Spacing: 10
@ -7029,6 +7152,80 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &4498426809452546078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 996536539065158426}
- component: {fileID: 209647186530052858}
- component: {fileID: 5726264874514444479}
m_Layer: 5
m_Name: Bg3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &996536539065158426
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498426809452546078}
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: 1820718257822173687}
m_RootOrder: 1
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: 0}
m_SizeDelta: {x: 1080, y: 1833}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &209647186530052858
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498426809452546078}
m_CullTransparentMesh: 0
--- !u!114 &5726264874514444479
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498426809452546078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5644df9ee5037554ba996f94cdc531af, 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
--- !u!1 &4668915026912685284
GameObject:
m_ObjectHideFlags: 0
@ -8995,7 +9192,7 @@ RectTransform:
- {fileID: 4845195722760884985}
- {fileID: 1876494193522904164}
m_Father: {fileID: 1792764959241262439}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -14893,6 +15090,154 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8186161311435929646}
m_CullTransparentMesh: 0
--- !u!1 &8327315105478471619
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6893026086784897140}
- component: {fileID: 8480489074927530339}
- component: {fileID: 5190262855195324117}
m_Layer: 5
m_Name: Bg1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6893026086784897140
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8327315105478471619}
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: 1820718257822173687}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8480489074927530339
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8327315105478471619}
m_CullTransparentMesh: 0
--- !u!114 &5190262855195324117
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8327315105478471619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ff5b4a7c4e932ae4abc1b4675bdb9df6, 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
--- !u!1 &8442993710598278120
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2210074410557156002}
- component: {fileID: 2423546049653599133}
- component: {fileID: 7645907499399457287}
m_Layer: 5
m_Name: red
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2210074410557156002
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8442993710598278120}
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: 235128951260794024}
m_RootOrder: 3
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.1, y: 39.49997}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2423546049653599133
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8442993710598278120}
m_CullTransparentMesh: 0
--- !u!114 &7645907499399457287
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8442993710598278120}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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
--- !u!1 &8613925313822943764
GameObject:
m_ObjectHideFlags: 0
@ -15010,7 +15355,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: 4.6, y: -700}
m_AnchoredPosition: {x: 4.6, y: -609}
m_SizeDelta: {x: 600, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3325518073787234455

View File

@ -616,7 +616,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
-- horizonta = starGrid:AddComponent(typeof(UnityEngine.UI.HorizontalLayoutGroup))
-- horizonta.childAlignment = "LowerLeft"
-- end
LogError("star====="..star)
--LogError("star====="..star)
if star>11 then
type=3
end

View File

@ -363,6 +363,25 @@ function this.GetItemDataByItemType(_itemType)
return items
end
--通过物品类型获得物品list
function this.GetItemDataByTimeIsGold(_id)
--LogError("_itemType ".._itemType)
local list={}
for i, v in pairs(this.bagDatas) do
if v.itemConfig.ItemType == ItemType.TimeIsGold and v.num > 0 and v.itemConfig.UseGain and v.itemConfig.UseGain[1][1]==_id then
table.insert(list,v)
end
end
if #list>0 then
table.sort(list,function(a,b)
return a.itemConfig.Quantity > b.itemConfig.Quantity
end)
return list[1]
end
return nil
end
--通过物品类型获得物品list
function this.GetDataByItemType(_itemType)

View File

@ -54,7 +54,8 @@ function TimeLimitUpHero:InitComponent()
self.sliderText=Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text")
self.sliderText2=Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text")
self.nextReward = Util.GetGameObject(self.getBtn, "reward")
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
self.Bg = Util.GetGameObject(self.gameObject,"Bg2"):GetComponent("Image")
self.mask1=Util.GetGameObject(self.gameObject,"Bg2/mask")
self.heroPar=Util.GetGameObject(self.mask1,"curObj")
@ -62,6 +63,7 @@ function TimeLimitUpHero:InitComponent()
self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero")
self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg")
self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red")
self.zqbgEffect = Util.GetGameObject(self.gameObject,"btngroup/zqbg/Fx_Circle 1")
BindRedPointObject(RedPointType.TimeLimitWishStore,self.zqbgRed)
self.heroIcon=Util.GetGameObject(self.btn_hero,"Icon"):GetComponent("Image")
self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image")
@ -146,7 +148,10 @@ function TimeLimitUpHero:OnOpen(_activityConfig,_index,parent)
self.parent = parent
end
function TimeLimitUpHero:OnSortingOrderChange()
function TimeLimitUpHero:OnSortingOrderChange(layer)
sortingOrder =layer
SetParticleSortLayer(self.effect,layer)
SetParticleSortLayer(self.zqbgEffect,layer)
end
-- 打开,重新打开时回调
@ -154,7 +159,9 @@ function TimeLimitUpHero:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
Util.SetParticleSortLayer(self.effect, sortingOrder+1)
Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1)
self.actId = self.actConfig.ActId
LogError("self.actId===="..self.actId.." self.actConfig.ActiveType=="..self.actConfig.ActiveType.." self.actConfig.FunType== "..self.actConfig.FunType)
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
if self.actConfig.IfBack == 1 then
if self.actConfig.ActiveType > 0 then

View File

@ -190,6 +190,7 @@ function this:InitComponent()
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan")
this.btnTianShuMiJuan:SetActive(false)
this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao")
this.operateIcon = {
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
@ -1408,7 +1409,8 @@ function this.InitFuncShow(funcType)
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.tianshumijuan) then
Util.SetGray(this.btnTianShuMiJuan,false)
else
Util.SetGray(this.btnTianShuMiJuan,true)
--屏蔽天书密卷入口 改成false
Util.SetGray(this.btnTianShuMiJuan,false)
end
--(百宝斋,点将台,锻器阁,化虚坛,竞技场,四元阵,灵兽山,送神祠,万象境)
if funcType then

View File

@ -55,13 +55,19 @@ function this:InitComponent()
currId=curConfig.Id
isFirst=true
end
--活动没开启页签不显示
if openTime>GetTimeStamp() then
tabBtn.gameObject:SetActive(false)
end
table.insert(this.btnList,tabBtn)
Util.AddClick(tabBtn,function ()
btnType=_
this.TabBtnOnClick(configInfo,tabBtn)
end)
end
if currId>5 then
this.grid:GetComponent("RectTransform").anchoredPosition=Vector2.New(300,9)
end
--显示货币
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
this.itemList = {}
@ -319,6 +325,7 @@ function this.UpdateRankInfo(go,data)
_PlayerHeadList[go]:SetScale(Vector3.one*0.7)
_PlayerHeadList[go]:SetLayer(this.sortingOrder)
_PlayerHeadList[go]:SetEffectScale(0.75)
local viewType=PLAYER_INFO_VIEW_TYPE.NORMAL
if rankType==RANK_TYPE.FORCE_CURR_RANK or rankType==RANK_TYPE.FightValue_chong then --战力排行
warPower:SetActive(true)
Util.GetGameObject(go,"warPower/Text"):SetActive(true)
@ -346,7 +353,7 @@ function this.UpdateRankInfo(go,data)
Util.AddOnceClick(go,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.MIND_DEMON)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,viewType)
end)
end

View File

@ -298,6 +298,7 @@ local redSort = {
[2] = 2,
[3] = 1,
[4] = 4,
[5] = 5,
}
--界面打开时调用(用于子类重写)

View File

@ -640,9 +640,23 @@ end
function this.GetRecruitData()
local dicData = {}
local allConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups, "PageType",1)
-- for i = 1,#allConfigs do
-- if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then
-- elseif allConfigs[i].FunType and allConfigs[i].FunType > 0 then
-- if allConfigs[i].IfBack == 1 then
-- if ActTimeCtrlManager.SingleFuncState(allConfigs[i].FunType) then
-- table.insert(dicData,allConfigs[i])
-- end
-- else
-- if ActTimeCtrlManager.IsQualifiled(allConfigs[i].FunType) then
-- table.insert(dicData,allConfigs[i])
-- end
-- end
-- end
-- end
for i = 1,#allConfigs do
if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then
elseif allConfigs[i].FunType and allConfigs[i].FunType > 0 then
--if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then
if allConfigs[i].FunType and allConfigs[i].FunType > 0 then
if allConfigs[i].IfBack == 1 then
if ActTimeCtrlManager.SingleFuncState(allConfigs[i].FunType) then
table.insert(dicData,allConfigs[i])

View File

@ -323,7 +323,7 @@ function RecruitPanelNew:UpdatePanelData()
itemId=d[1]
itemNum=d[2]
m.icon.sprite=self.spLoader:LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
m.num.text= tostring(itemNum)
m.num.text= PrintWanNum2(itemNum)
end
Util.AddOnceClick(m.btn,function()

View File

@ -1007,8 +1007,17 @@ function RoleInfoLayout:ShowCostNotEnoughTip()
else
PopupTipPanel.ShowTip(BagManager.GetItemNameById(costId).."不足无法升级")
end
local item=BagManager.GetItemDataByTimeIsGold(costId)
if item then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4,item)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId)
end
local _itemData = BagManager.bagDatas[itemSid]
--if costId==4 then
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId)
--end
end

View File

@ -7,14 +7,14 @@ local redPointList = {}
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local tabs = {
[1] = { --神将
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
},
[2] = { --魂印
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
},
-- [1] = { --神将
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
-- rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
-- },
-- [2] = { --魂印
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
-- rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
-- },
[3] = { --灵兽
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12276],
rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh",