Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
ba6ee4065d
|
|
@ -1106,6 +1106,86 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1.44
|
m_LineSpacing: 1.44
|
||||||
m_Text: "[\u4F20\u8BF4]"
|
m_Text: "[\u4F20\u8BF4]"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &1717049933628633538
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5065950952002995755}
|
||||||
|
- component: {fileID: 7614690502931396797}
|
||||||
|
- component: {fileID: 3268828512051866664}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5065950952002995755
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1717049933628633538}
|
||||||
|
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: 1186356212107393347}
|
||||||
|
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: -1.44, y: 0.39999998}
|
||||||
|
m_SizeDelta: {x: 157.13, y: 65.07}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &7614690502931396797
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1717049933628633538}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3268828512051866664
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1717049933628633538}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 45
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 4
|
||||||
|
m_MaxSize: 50
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u795E \u5E94"
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &1916479584695423167
|
--- !u!1 &1916479584695423167
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1374,7 +1454,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 975756852464196217}
|
- {fileID: 975756852464196217}
|
||||||
m_Father: {fileID: 1010245359547345673}
|
m_Father: {fileID: 1010245359547345673}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 7
|
||||||
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: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
|
@ -1850,6 +1930,7 @@ RectTransform:
|
||||||
- {fileID: 4891123270940357789}
|
- {fileID: 4891123270940357789}
|
||||||
- {fileID: 1599797043945116798}
|
- {fileID: 1599797043945116798}
|
||||||
- {fileID: 8824000577553895258}
|
- {fileID: 8824000577553895258}
|
||||||
|
- {fileID: 1186356212107393347}
|
||||||
- {fileID: 4500865012540515716}
|
- {fileID: 4500865012540515716}
|
||||||
- {fileID: 7642768539238583952}
|
- {fileID: 7642768539238583952}
|
||||||
- {fileID: 7149182338749368006}
|
- {fileID: 7149182338749368006}
|
||||||
|
|
@ -3214,7 +3295,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 806560631778654466}
|
- {fileID: 806560631778654466}
|
||||||
m_Father: {fileID: 1010245359547345673}
|
m_Father: {fileID: 1010245359547345673}
|
||||||
m_RootOrder: 7
|
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}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
|
@ -4995,6 +5076,146 @@ MonoBehaviour:
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
|
--- !u!1 &7431839333758148623
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1186356212107393347}
|
||||||
|
- component: {fileID: 717001434057435752}
|
||||||
|
- component: {fileID: 4784262197537424176}
|
||||||
|
- component: {fileID: 5693824147692492359}
|
||||||
|
- component: {fileID: 4767046654883573019}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: btnShenYing
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1186356212107393347
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431839333758148623}
|
||||||
|
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: 5065950952002995755}
|
||||||
|
- {fileID: 1994598492216469491}
|
||||||
|
m_Father: {fileID: 1010245359547345673}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &717001434057435752
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431839333758148623}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4784262197537424176
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431839333758148623}
|
||||||
|
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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 1
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &5693824147692492359
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431839333758148623}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 3
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91,
|
||||||
|
type: 3}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 4784262197537424176}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &4767046654883573019
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7431839333758148623}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &7490775521574160352
|
--- !u!1 &7490775521574160352
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -5028,7 +5249,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7611885424116652739}
|
- {fileID: 7611885424116652739}
|
||||||
m_Father: {fileID: 1010245359547345673}
|
m_Father: {fileID: 1010245359547345673}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 6
|
||||||
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: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
|
@ -5767,6 +5988,80 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_HorizontalFit: 0
|
m_HorizontalFit: 0
|
||||||
m_VerticalFit: 2
|
m_VerticalFit: 2
|
||||||
|
--- !u!1 &8909109191214783874
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1994598492216469491}
|
||||||
|
- component: {fileID: 2436267017511659527}
|
||||||
|
- component: {fileID: 2768048493317129841}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: red
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1994598492216469491
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8909109191214783874}
|
||||||
|
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: 1186356212107393347}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -15, y: -15}
|
||||||
|
m_SizeDelta: {x: 30, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2436267017511659527
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8909109191214783874}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &2768048493317129841
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8909109191214783874}
|
||||||
|
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 &8955149195664373463
|
--- !u!1 &8955149195664373463
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ RectTransform:
|
||||||
- {fileID: 224858912925290730}
|
- {fileID: 224858912925290730}
|
||||||
- {fileID: 224231594156623100}
|
- {fileID: 224231594156623100}
|
||||||
- {fileID: 1487334206293699636}
|
- {fileID: 1487334206293699636}
|
||||||
|
- {fileID: 7217159854697762424}
|
||||||
- {fileID: 8706596596834716011}
|
- {fileID: 8706596596834716011}
|
||||||
- {fileID: 8601325964190918751}
|
- {fileID: 8601325964190918751}
|
||||||
m_Father: {fileID: 224400331968681076}
|
m_Father: {fileID: 224400331968681076}
|
||||||
|
|
@ -801,8 +802,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: -1.2075, y: 272.5}
|
m_AnchoredPosition: {x: -1.2075, y: 302.26}
|
||||||
m_SizeDelta: {x: 932.4, y: 578.4}
|
m_SizeDelta: {x: 932.4, y: 518.89}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1312853492439174918
|
--- !u!1 &1312853492439174918
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -834,8 +835,9 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5304136016580012509}
|
- {fileID: 5304136016580012509}
|
||||||
- {fileID: 7987669967423616727}
|
- {fileID: 7987669967423616727}
|
||||||
|
- {fileID: 7455508544922696764}
|
||||||
m_Father: {fileID: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 11
|
||||||
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}
|
||||||
|
|
@ -866,6 +868,263 @@ MonoBehaviour:
|
||||||
m_Spacing: {x: 65.96, y: 0}
|
m_Spacing: {x: 65.96, y: 0}
|
||||||
m_Constraint: 2
|
m_Constraint: 2
|
||||||
m_ConstraintCount: 1
|
m_ConstraintCount: 1
|
||||||
|
--- !u!1 &1344584379191714594
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3627355899698669701}
|
||||||
|
- component: {fileID: 3921266011232505013}
|
||||||
|
- component: {fileID: 5775659623131621778}
|
||||||
|
- component: {fileID: 8881854771112026658}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: btnShenying
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3627355899698669701
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1344584379191714594}
|
||||||
|
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: 4587525731648090941}
|
||||||
|
- {fileID: 7818925448350290679}
|
||||||
|
m_Father: {fileID: 6863185804939559100}
|
||||||
|
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: 190, y: -23.84198}
|
||||||
|
m_SizeDelta: {x: 224.68, y: 110.87}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3921266011232505013
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1344584379191714594}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5775659623131621778
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1344584379191714594}
|
||||||
|
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: dcab34f84847d94448b245ab7e62e44e, 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!114 &8881854771112026658
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1344584379191714594}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 5775659623131621778}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!1 &1382062003375518480
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7455508544922696764}
|
||||||
|
- component: {fileID: 3160561257469082735}
|
||||||
|
- component: {fileID: 4550952032559534407}
|
||||||
|
- component: {fileID: 3824671575298234689}
|
||||||
|
- component: {fileID: 6498581205011545223}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: btnShenying
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7455508544922696764
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382062003375518480}
|
||||||
|
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: 2182139346712250726}
|
||||||
|
m_Father: {fileID: 8766961231832293434}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3160561257469082735
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382062003375518480}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4550952032559534407
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382062003375518480}
|
||||||
|
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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 1
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &3824671575298234689
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382062003375518480}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 3
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 4550952032559534407}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &6498581205011545223
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382062003375518480}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &1479426666700072429
|
--- !u!1 &1479426666700072429
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1088,7 +1347,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: 93.56, y: -23.842}
|
m_AnchoredPosition: {x: 0, y: -23.842}
|
||||||
m_SizeDelta: {x: 224.68, y: 110.87}
|
m_SizeDelta: {x: 224.68, y: 110.87}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &903598582962903888
|
--- !u!222 &903598582962903888
|
||||||
|
|
@ -1207,7 +1466,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: -98.12, y: -23.843}
|
m_AnchoredPosition: {x: -190, y: -23.843}
|
||||||
m_SizeDelta: {x: 221.56, y: 110.87}
|
m_SizeDelta: {x: 221.56, y: 110.87}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4663026695833607491
|
--- !u!222 &4663026695833607491
|
||||||
|
|
@ -1319,7 +1578,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: 224199271576904048}
|
m_Father: {fileID: 224199271576904048}
|
||||||
m_RootOrder: 3
|
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}
|
||||||
|
|
@ -1709,6 +1968,80 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u7CBE \u70BC"
|
m_Text: "\u7CBE \u70BC"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &3793340513267332292
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7217159854697762424}
|
||||||
|
- component: {fileID: 4897021660228937839}
|
||||||
|
- component: {fileID: 241911333891667086}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image (5)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7217159854697762424
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3793340513267332292}
|
||||||
|
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: 224199271576904048}
|
||||||
|
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: -0.29003906, y: 38.5}
|
||||||
|
m_SizeDelta: {x: 898.92, y: 4.44}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &4897021660228937839
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3793340513267332292}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &241911333891667086
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3793340513267332292}
|
||||||
|
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: 19d5542f3ad36154883cfc2022d17e0a, 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 &3942217229165222720
|
--- !u!1 &3942217229165222720
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1819,9 +2152,10 @@ RectTransform:
|
||||||
- {fileID: 6342299792110033615}
|
- {fileID: 6342299792110033615}
|
||||||
- {fileID: 5482789836646361175}
|
- {fileID: 5482789836646361175}
|
||||||
- {fileID: 1499697434375710272}
|
- {fileID: 1499697434375710272}
|
||||||
|
- {fileID: 3627355899698669701}
|
||||||
- {fileID: 6677696287487751865}
|
- {fileID: 6677696287487751865}
|
||||||
m_Father: {fileID: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 12
|
||||||
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: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
|
@ -1866,7 +2200,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: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 10
|
||||||
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}
|
||||||
|
|
@ -1944,6 +2278,7 @@ RectTransform:
|
||||||
- {fileID: 1637966701065397349}
|
- {fileID: 1637966701065397349}
|
||||||
- {fileID: 5759551155482145231}
|
- {fileID: 5759551155482145231}
|
||||||
- {fileID: 3353385484946297119}
|
- {fileID: 3353385484946297119}
|
||||||
|
- {fileID: 8131619857262012692}
|
||||||
- {fileID: 185713926109366426}
|
- {fileID: 185713926109366426}
|
||||||
- {fileID: 2877954084376210547}
|
- {fileID: 2877954084376210547}
|
||||||
- {fileID: 7483877465745836902}
|
- {fileID: 7483877465745836902}
|
||||||
|
|
@ -1951,7 +2286,7 @@ RectTransform:
|
||||||
- {fileID: 8766961231832293434}
|
- {fileID: 8766961231832293434}
|
||||||
- {fileID: 6863185804939559100}
|
- {fileID: 6863185804939559100}
|
||||||
m_Father: {fileID: 224199271576904048}
|
m_Father: {fileID: 224199271576904048}
|
||||||
m_RootOrder: 4
|
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}
|
||||||
|
|
@ -2149,7 +2484,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: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 7
|
m_RootOrder: 8
|
||||||
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}
|
||||||
|
|
@ -2209,6 +2544,8 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 185713926109366426}
|
- component: {fileID: 185713926109366426}
|
||||||
- component: {fileID: 1102433259614153313}
|
- component: {fileID: 1102433259614153313}
|
||||||
|
- component: {fileID: 7955856781421403391}
|
||||||
|
- component: {fileID: 6251636356745063903}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: secondScroll
|
m_Name: secondScroll
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -2227,10 +2564,9 @@ 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: 8131619857262012692}
|
|
||||||
- {fileID: 5076362339141073474}
|
- {fileID: 5076362339141073474}
|
||||||
m_Father: {fileID: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 6
|
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.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -2244,7 +2580,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 6009482287880547055}
|
m_GameObject: {fileID: 6009482287880547055}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|
@ -2260,6 +2596,50 @@ MonoBehaviour:
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
|
--- !u!114 &7955856781421403391
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6009482287880547055}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Content: {fileID: 5076362339141073474}
|
||||||
|
m_Horizontal: 0
|
||||||
|
m_Vertical: 1
|
||||||
|
m_MovementType: 1
|
||||||
|
m_Elasticity: 0.1
|
||||||
|
m_Inertia: 1
|
||||||
|
m_DecelerationRate: 0.135
|
||||||
|
m_ScrollSensitivity: 1
|
||||||
|
m_Viewport: {fileID: 0}
|
||||||
|
m_HorizontalScrollbar: {fileID: 0}
|
||||||
|
m_VerticalScrollbar: {fileID: 0}
|
||||||
|
m_HorizontalScrollbarVisibility: 0
|
||||||
|
m_VerticalScrollbarVisibility: 0
|
||||||
|
m_HorizontalScrollbarSpacing: 0
|
||||||
|
m_VerticalScrollbarSpacing: 0
|
||||||
|
m_OnValueChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!114 &6251636356745063903
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6009482287880547055}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &6110083088568785268
|
--- !u!1 &6110083088568785268
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2489,6 +2869,102 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5F3A\u5316\u7B49\u7EA7"
|
m_Text: "\u5F3A\u5316\u7B49\u7EA7"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &6372108028975021019
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4587525731648090941}
|
||||||
|
- component: {fileID: 5345452754046996680}
|
||||||
|
- component: {fileID: 3894709231104119886}
|
||||||
|
- component: {fileID: 2562805626921181705}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4587525731648090941
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6372108028975021019}
|
||||||
|
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: 3627355899698669701}
|
||||||
|
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.24, y: 3.5}
|
||||||
|
m_SizeDelta: {x: 122.72, y: 75.16}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5345452754046996680
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6372108028975021019}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3894709231104119886
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6372108028975021019}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
|
m_EffectDistance: {x: 1, y: -1}
|
||||||
|
m_UseGraphicAlpha: 1
|
||||||
|
--- !u!114 &2562805626921181705
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6372108028975021019}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, 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_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 45
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 1
|
||||||
|
m_MinSize: 4
|
||||||
|
m_MaxSize: 45
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u795E \u5E94"
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &6451632583078169862
|
--- !u!1 &6451632583078169862
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2668,7 +3144,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5715787950697399459}
|
- {fileID: 5715787950697399459}
|
||||||
m_Father: {fileID: 6863185804939559100}
|
m_Father: {fileID: 6863185804939559100}
|
||||||
m_RootOrder: 3
|
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}
|
||||||
|
|
@ -2712,6 +3188,86 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &7400315987968953576
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2182139346712250726}
|
||||||
|
- component: {fileID: 6684058082757157845}
|
||||||
|
- component: {fileID: 8818674824900225236}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2182139346712250726
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7400315987968953576}
|
||||||
|
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: 7455508544922696764}
|
||||||
|
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: 1.6, y: 0.8}
|
||||||
|
m_SizeDelta: {x: 203.8, y: 62.2}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6684058082757157845
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7400315987968953576}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8818674824900225236
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7400315987968953576}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 45
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 1
|
||||||
|
m_MinSize: 4
|
||||||
|
m_MaxSize: 45
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u5347 \u7EA7"
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &7411879412420740757
|
--- !u!1 &7411879412420740757
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2839,12 +3395,12 @@ RectTransform:
|
||||||
- {fileID: 4312717128000631083}
|
- {fileID: 4312717128000631083}
|
||||||
- {fileID: 9037458184156353713}
|
- {fileID: 9037458184156353713}
|
||||||
- {fileID: 4497224548005237276}
|
- {fileID: 4497224548005237276}
|
||||||
m_Father: {fileID: 185713926109366426}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 6
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 469.4, y: -670.8}
|
||||||
m_SizeDelta: {x: 912.8, y: 60}
|
m_SizeDelta: {x: 912.8, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &7669026485797189264
|
--- !u!1 &7669026485797189264
|
||||||
|
|
@ -2985,11 +3541,11 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 185713926109366426}
|
m_Father: {fileID: 185713926109366426}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 456.4, y: 0}
|
||||||
m_SizeDelta: {x: 912.8, y: 0}
|
m_SizeDelta: {x: 912.8, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &3795659575372293691
|
--- !u!114 &3795659575372293691
|
||||||
|
|
@ -3132,7 +3688,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: 8601325964190918751}
|
m_Father: {fileID: 8601325964190918751}
|
||||||
m_RootOrder: 8
|
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}
|
||||||
|
|
@ -3438,3 +3994,77 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
|
--- !u!1 &9013305125353508233
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7818925448350290679}
|
||||||
|
- component: {fileID: 207568323831459994}
|
||||||
|
- component: {fileID: 1107605728514167676}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: red
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &7818925448350290679
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 9013305125353508233}
|
||||||
|
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: 3627355899698669701}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -29.3, y: -18.6}
|
||||||
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &207568323831459994
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 9013305125353508233}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1107605728514167676
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 9013305125353508233}
|
||||||
|
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: 0
|
||||||
|
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
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,6 @@ NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD = protobuf.FieldDescriptor();
|
||||||
NEWGENERALATTACKRESPONSE = protobuf.Descriptor();
|
NEWGENERALATTACKRESPONSE = protobuf.Descriptor();
|
||||||
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||||
NEWGENERALATTACKRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
NEWGENERALATTACKRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||||
UPGRADEGODTREEREQUEST = protobuf.Descriptor();
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD = protobuf.FieldDescriptor();
|
|
||||||
UPGRADEGODTREERESPONSE = protobuf.Descriptor();
|
|
||||||
GOODLUCKREQUEST = protobuf.Descriptor();
|
GOODLUCKREQUEST = protobuf.Descriptor();
|
||||||
GOODLUCKREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
GOODLUCKREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||||
GOODLUCKRESPONSE = protobuf.Descriptor();
|
GOODLUCKRESPONSE = protobuf.Descriptor();
|
||||||
|
|
@ -307,30 +304,6 @@ NEWGENERALATTACKRESPONSE.enum_types = {}
|
||||||
NEWGENERALATTACKRESPONSE.fields = {NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD, NEWGENERALATTACKRESPONSE_DROP_FIELD}
|
NEWGENERALATTACKRESPONSE.fields = {NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD, NEWGENERALATTACKRESPONSE_DROP_FIELD}
|
||||||
NEWGENERALATTACKRESPONSE.is_extendable = false
|
NEWGENERALATTACKRESPONSE.is_extendable = false
|
||||||
NEWGENERALATTACKRESPONSE.extensions = {}
|
NEWGENERALATTACKRESPONSE.extensions = {}
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.name = "count"
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.full_name = ".rpc.protocols.UpgradeGodTreeRequest.count"
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.number = 1
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.index = 0
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.label = 1
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.has_default_value = false
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.default_value = 0
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.type = 5
|
|
||||||
UPGRADEGODTREEREQUEST_COUNT_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
UPGRADEGODTREEREQUEST.name = "UpgradeGodTreeRequest"
|
|
||||||
UPGRADEGODTREEREQUEST.full_name = ".rpc.protocols.UpgradeGodTreeRequest"
|
|
||||||
UPGRADEGODTREEREQUEST.nested_types = {}
|
|
||||||
UPGRADEGODTREEREQUEST.enum_types = {}
|
|
||||||
UPGRADEGODTREEREQUEST.fields = {UPGRADEGODTREEREQUEST_COUNT_FIELD}
|
|
||||||
UPGRADEGODTREEREQUEST.is_extendable = false
|
|
||||||
UPGRADEGODTREEREQUEST.extensions = {}
|
|
||||||
UPGRADEGODTREERESPONSE.name = "UpgradeGodTreeResponse"
|
|
||||||
UPGRADEGODTREERESPONSE.full_name = ".rpc.protocols.UpgradeGodTreeResponse"
|
|
||||||
UPGRADEGODTREERESPONSE.nested_types = {}
|
|
||||||
UPGRADEGODTREERESPONSE.enum_types = {}
|
|
||||||
UPGRADEGODTREERESPONSE.fields = {}
|
|
||||||
UPGRADEGODTREERESPONSE.is_extendable = false
|
|
||||||
UPGRADEGODTREERESPONSE.extensions = {}
|
|
||||||
GOODLUCKREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
GOODLUCKREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||||
GOODLUCKREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.GoodLuckRequest.activityId"
|
GOODLUCKREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.GoodLuckRequest.activityId"
|
||||||
GOODLUCKREQUEST_ACTIVITYID_FIELD.number = 1
|
GOODLUCKREQUEST_ACTIVITYID_FIELD.number = 1
|
||||||
|
|
@ -1078,8 +1051,6 @@ TasuilingxiaoRequest = protobuf.Message(TASUILINGXIAOREQUEST)
|
||||||
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
||||||
TrumpGachaSelectItemRequest = protobuf.Message(TRUMPGACHASELECTITEMREQUEST)
|
TrumpGachaSelectItemRequest = protobuf.Message(TRUMPGACHASELECTITEMREQUEST)
|
||||||
UpStarActivitySelectRequest = protobuf.Message(UPSTARACTIVITYSELECTREQUEST)
|
UpStarActivitySelectRequest = protobuf.Message(UPSTARACTIVITYSELECTREQUEST)
|
||||||
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
|
||||||
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
|
||||||
WeekCardIndicationInfoResponse = protobuf.Message(WEEKCARDINDICATIONINFORESPONSE)
|
WeekCardIndicationInfoResponse = protobuf.Message(WEEKCARDINDICATIONINFORESPONSE)
|
||||||
WeekCardInfoRequest = protobuf.Message(WEEKCARDINFOREQUEST)
|
WeekCardInfoRequest = protobuf.Message(WEEKCARDINFOREQUEST)
|
||||||
WeekCardInfoResponse = protobuf.Message(WEEKCARDINFORESPONSE)
|
WeekCardInfoResponse = protobuf.Message(WEEKCARDINFORESPONSE)
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ PLAYER_DECROTION_FIELD = protobuf.FieldDescriptor();
|
||||||
PLAYER_RIDE_FIELD = protobuf.FieldDescriptor();
|
PLAYER_RIDE_FIELD = protobuf.FieldDescriptor();
|
||||||
PLAYER_RIDELEVEL_FIELD = protobuf.FieldDescriptor();
|
PLAYER_RIDELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||||
PLAYER_SEX_FIELD = protobuf.FieldDescriptor();
|
PLAYER_SEX_FIELD = protobuf.FieldDescriptor();
|
||||||
PLAYER_TREELEVEL_FIELD = protobuf.FieldDescriptor();
|
|
||||||
PRIVILEGE = protobuf.Descriptor();
|
PRIVILEGE = protobuf.Descriptor();
|
||||||
PRIVILEGE_ID_FIELD = protobuf.FieldDescriptor();
|
PRIVILEGE_ID_FIELD = protobuf.FieldDescriptor();
|
||||||
PRIVILEGE_USEDTIMES_FIELD = protobuf.FieldDescriptor();
|
PRIVILEGE_USEDTIMES_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
@ -51,12 +50,7 @@ HEADFRAMELIST_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP = protobuf.Descriptor();
|
EQUIP = protobuf.Descriptor();
|
||||||
EQUIP_ID_FIELD = protobuf.FieldDescriptor();
|
EQUIP_ID_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
EQUIP_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP_MAINATTRIBUTE_FIELD = protobuf.FieldDescriptor();
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD = protobuf.FieldDescriptor();
|
|
||||||
EQUIP_REBUILDLEVEL_FIELD = protobuf.FieldDescriptor();
|
EQUIP_REBUILDLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP_CREATETIME_FIELD = protobuf.FieldDescriptor();
|
|
||||||
EQUIP_SKILLID_FIELD = protobuf.FieldDescriptor();
|
|
||||||
EQUIP_ISLOCKED_FIELD = protobuf.FieldDescriptor();
|
|
||||||
EQUIP_EXP_FIELD = protobuf.FieldDescriptor();
|
EQUIP_EXP_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP_TREELV_FIELD = protobuf.FieldDescriptor();
|
EQUIP_TREELV_FIELD = protobuf.FieldDescriptor();
|
||||||
EQUIP_FOURSPIRIT_FIELD = protobuf.FieldDescriptor();
|
EQUIP_FOURSPIRIT_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
@ -1177,21 +1171,11 @@ PLAYER_SEX_FIELD.default_value = 0
|
||||||
PLAYER_SEX_FIELD.type = 5
|
PLAYER_SEX_FIELD.type = 5
|
||||||
PLAYER_SEX_FIELD.cpp_type = 1
|
PLAYER_SEX_FIELD.cpp_type = 1
|
||||||
|
|
||||||
PLAYER_TREELEVEL_FIELD.name = "treeLevel"
|
|
||||||
PLAYER_TREELEVEL_FIELD.full_name = ".rpc.protocols.Player.treeLevel"
|
|
||||||
PLAYER_TREELEVEL_FIELD.number = 25
|
|
||||||
PLAYER_TREELEVEL_FIELD.index = 24
|
|
||||||
PLAYER_TREELEVEL_FIELD.label = 1
|
|
||||||
PLAYER_TREELEVEL_FIELD.has_default_value = false
|
|
||||||
PLAYER_TREELEVEL_FIELD.default_value = 0
|
|
||||||
PLAYER_TREELEVEL_FIELD.type = 5
|
|
||||||
PLAYER_TREELEVEL_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
PLAYER.name = "Player"
|
PLAYER.name = "Player"
|
||||||
PLAYER.full_name = ".rpc.protocols.Player"
|
PLAYER.full_name = ".rpc.protocols.Player"
|
||||||
PLAYER.nested_types = {}
|
PLAYER.nested_types = {}
|
||||||
PLAYER.enum_types = {}
|
PLAYER.enum_types = {}
|
||||||
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD, PLAYER_TREELEVEL_FIELD}
|
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD}
|
||||||
PLAYER.is_extendable = false
|
PLAYER.is_extendable = false
|
||||||
PLAYER.extensions = {}
|
PLAYER.extensions = {}
|
||||||
PRIVILEGE_ID_FIELD.name = "id"
|
PRIVILEGE_ID_FIELD.name = "id"
|
||||||
|
|
@ -1352,72 +1336,20 @@ EQUIP_EQUIPID_FIELD.default_value = 0
|
||||||
EQUIP_EQUIPID_FIELD.type = 5
|
EQUIP_EQUIPID_FIELD.type = 5
|
||||||
EQUIP_EQUIPID_FIELD.cpp_type = 1
|
EQUIP_EQUIPID_FIELD.cpp_type = 1
|
||||||
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.name = "mainAttribute"
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.full_name = ".rpc.protocols.Equip.mainAttribute"
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.number = 3
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.index = 2
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.label = 1
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.has_default_value = false
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.default_value = nil
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.message_type = SPECIALEFFECTS
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.type = 11
|
|
||||||
EQUIP_MAINATTRIBUTE_FIELD.cpp_type = 10
|
|
||||||
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.name = "secondAttribute"
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.full_name = ".rpc.protocols.Equip.secondAttribute"
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.number = 4
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.index = 3
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.label = 3
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.has_default_value = false
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.default_value = {}
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.message_type = SPECIALEFFECTS
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.type = 11
|
|
||||||
EQUIP_SECONDATTRIBUTE_FIELD.cpp_type = 10
|
|
||||||
|
|
||||||
EQUIP_REBUILDLEVEL_FIELD.name = "rebuildLevel"
|
EQUIP_REBUILDLEVEL_FIELD.name = "rebuildLevel"
|
||||||
EQUIP_REBUILDLEVEL_FIELD.full_name = ".rpc.protocols.Equip.rebuildLevel"
|
EQUIP_REBUILDLEVEL_FIELD.full_name = ".rpc.protocols.Equip.rebuildLevel"
|
||||||
EQUIP_REBUILDLEVEL_FIELD.number = 5
|
EQUIP_REBUILDLEVEL_FIELD.number = 3
|
||||||
EQUIP_REBUILDLEVEL_FIELD.index = 4
|
EQUIP_REBUILDLEVEL_FIELD.index = 2
|
||||||
EQUIP_REBUILDLEVEL_FIELD.label = 1
|
EQUIP_REBUILDLEVEL_FIELD.label = 1
|
||||||
EQUIP_REBUILDLEVEL_FIELD.has_default_value = false
|
EQUIP_REBUILDLEVEL_FIELD.has_default_value = false
|
||||||
EQUIP_REBUILDLEVEL_FIELD.default_value = 0
|
EQUIP_REBUILDLEVEL_FIELD.default_value = 0
|
||||||
EQUIP_REBUILDLEVEL_FIELD.type = 5
|
EQUIP_REBUILDLEVEL_FIELD.type = 5
|
||||||
EQUIP_REBUILDLEVEL_FIELD.cpp_type = 1
|
EQUIP_REBUILDLEVEL_FIELD.cpp_type = 1
|
||||||
|
|
||||||
EQUIP_CREATETIME_FIELD.name = "createTime"
|
|
||||||
EQUIP_CREATETIME_FIELD.full_name = ".rpc.protocols.Equip.createTime"
|
|
||||||
EQUIP_CREATETIME_FIELD.number = 6
|
|
||||||
EQUIP_CREATETIME_FIELD.index = 5
|
|
||||||
EQUIP_CREATETIME_FIELD.label = 1
|
|
||||||
EQUIP_CREATETIME_FIELD.has_default_value = false
|
|
||||||
EQUIP_CREATETIME_FIELD.default_value = 0
|
|
||||||
EQUIP_CREATETIME_FIELD.type = 5
|
|
||||||
EQUIP_CREATETIME_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
EQUIP_SKILLID_FIELD.name = "skillId"
|
|
||||||
EQUIP_SKILLID_FIELD.full_name = ".rpc.protocols.Equip.skillId"
|
|
||||||
EQUIP_SKILLID_FIELD.number = 7
|
|
||||||
EQUIP_SKILLID_FIELD.index = 6
|
|
||||||
EQUIP_SKILLID_FIELD.label = 1
|
|
||||||
EQUIP_SKILLID_FIELD.has_default_value = false
|
|
||||||
EQUIP_SKILLID_FIELD.default_value = 0
|
|
||||||
EQUIP_SKILLID_FIELD.type = 5
|
|
||||||
EQUIP_SKILLID_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
EQUIP_ISLOCKED_FIELD.name = "isLocked"
|
|
||||||
EQUIP_ISLOCKED_FIELD.full_name = ".rpc.protocols.Equip.isLocked"
|
|
||||||
EQUIP_ISLOCKED_FIELD.number = 8
|
|
||||||
EQUIP_ISLOCKED_FIELD.index = 7
|
|
||||||
EQUIP_ISLOCKED_FIELD.label = 1
|
|
||||||
EQUIP_ISLOCKED_FIELD.has_default_value = false
|
|
||||||
EQUIP_ISLOCKED_FIELD.default_value = 0
|
|
||||||
EQUIP_ISLOCKED_FIELD.type = 5
|
|
||||||
EQUIP_ISLOCKED_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
EQUIP_EXP_FIELD.name = "exp"
|
EQUIP_EXP_FIELD.name = "exp"
|
||||||
EQUIP_EXP_FIELD.full_name = ".rpc.protocols.Equip.exp"
|
EQUIP_EXP_FIELD.full_name = ".rpc.protocols.Equip.exp"
|
||||||
EQUIP_EXP_FIELD.number = 9
|
EQUIP_EXP_FIELD.number = 4
|
||||||
EQUIP_EXP_FIELD.index = 8
|
EQUIP_EXP_FIELD.index = 3
|
||||||
EQUIP_EXP_FIELD.label = 1
|
EQUIP_EXP_FIELD.label = 1
|
||||||
EQUIP_EXP_FIELD.has_default_value = false
|
EQUIP_EXP_FIELD.has_default_value = false
|
||||||
EQUIP_EXP_FIELD.default_value = 0
|
EQUIP_EXP_FIELD.default_value = 0
|
||||||
|
|
@ -1426,8 +1358,8 @@ EQUIP_EXP_FIELD.cpp_type = 1
|
||||||
|
|
||||||
EQUIP_TREELV_FIELD.name = "treeLv"
|
EQUIP_TREELV_FIELD.name = "treeLv"
|
||||||
EQUIP_TREELV_FIELD.full_name = ".rpc.protocols.Equip.treeLv"
|
EQUIP_TREELV_FIELD.full_name = ".rpc.protocols.Equip.treeLv"
|
||||||
EQUIP_TREELV_FIELD.number = 10
|
EQUIP_TREELV_FIELD.number = 5
|
||||||
EQUIP_TREELV_FIELD.index = 9
|
EQUIP_TREELV_FIELD.index = 4
|
||||||
EQUIP_TREELV_FIELD.label = 1
|
EQUIP_TREELV_FIELD.label = 1
|
||||||
EQUIP_TREELV_FIELD.has_default_value = false
|
EQUIP_TREELV_FIELD.has_default_value = false
|
||||||
EQUIP_TREELV_FIELD.default_value = 0
|
EQUIP_TREELV_FIELD.default_value = 0
|
||||||
|
|
@ -1436,8 +1368,8 @@ EQUIP_TREELV_FIELD.cpp_type = 1
|
||||||
|
|
||||||
EQUIP_FOURSPIRIT_FIELD.name = "fourSpirit"
|
EQUIP_FOURSPIRIT_FIELD.name = "fourSpirit"
|
||||||
EQUIP_FOURSPIRIT_FIELD.full_name = ".rpc.protocols.Equip.fourSpirit"
|
EQUIP_FOURSPIRIT_FIELD.full_name = ".rpc.protocols.Equip.fourSpirit"
|
||||||
EQUIP_FOURSPIRIT_FIELD.number = 11
|
EQUIP_FOURSPIRIT_FIELD.number = 6
|
||||||
EQUIP_FOURSPIRIT_FIELD.index = 10
|
EQUIP_FOURSPIRIT_FIELD.index = 5
|
||||||
EQUIP_FOURSPIRIT_FIELD.label = 1
|
EQUIP_FOURSPIRIT_FIELD.label = 1
|
||||||
EQUIP_FOURSPIRIT_FIELD.has_default_value = false
|
EQUIP_FOURSPIRIT_FIELD.has_default_value = false
|
||||||
EQUIP_FOURSPIRIT_FIELD.default_value = 0
|
EQUIP_FOURSPIRIT_FIELD.default_value = 0
|
||||||
|
|
@ -1448,7 +1380,7 @@ EQUIP.name = "Equip"
|
||||||
EQUIP.full_name = ".rpc.protocols.Equip"
|
EQUIP.full_name = ".rpc.protocols.Equip"
|
||||||
EQUIP.nested_types = {}
|
EQUIP.nested_types = {}
|
||||||
EQUIP.enum_types = {}
|
EQUIP.enum_types = {}
|
||||||
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD}
|
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD}
|
||||||
EQUIP.is_extendable = false
|
EQUIP.is_extendable = false
|
||||||
EQUIP.extensions = {}
|
EQUIP.extensions = {}
|
||||||
SOULPOS_EQUIPID_FIELD.name = "equipId"
|
SOULPOS_EQUIPID_FIELD.name = "equipId"
|
||||||
|
|
|
||||||
|
|
@ -331,6 +331,10 @@ HOMEEQUIPSTRONGRESETREQUSET = protobuf.Descriptor();
|
||||||
HOMEEQUIPSTRONGRESETREQUSET_HEROID_FIELD = protobuf.FieldDescriptor();
|
HOMEEQUIPSTRONGRESETREQUSET_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||||
HOMEEQUIPSTRONGRESETRESPONSE = protobuf.Descriptor();
|
HOMEEQUIPSTRONGRESETRESPONSE = protobuf.Descriptor();
|
||||||
HOMEEQUIPSTRONGRESETRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
HOMEEQUIPSTRONGRESETRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||||
|
UPGRADEGODTREEREQUEST = protobuf.Descriptor();
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD = protobuf.FieldDescriptor();
|
||||||
|
UPGRADEGODTREERESPONSE = protobuf.Descriptor();
|
||||||
|
|
||||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
||||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
||||||
|
|
@ -3308,6 +3312,40 @@ HOMEEQUIPSTRONGRESETRESPONSE.enum_types = {}
|
||||||
HOMEEQUIPSTRONGRESETRESPONSE.fields = {HOMEEQUIPSTRONGRESETRESPONSE_DROP_FIELD}
|
HOMEEQUIPSTRONGRESETRESPONSE.fields = {HOMEEQUIPSTRONGRESETRESPONSE_DROP_FIELD}
|
||||||
HOMEEQUIPSTRONGRESETRESPONSE.is_extendable = false
|
HOMEEQUIPSTRONGRESETRESPONSE.is_extendable = false
|
||||||
HOMEEQUIPSTRONGRESETRESPONSE.extensions = {}
|
HOMEEQUIPSTRONGRESETRESPONSE.extensions = {}
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.name = "jewelId"
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.full_name = ".rpc.protocols.UpgradeGodTreeRequest.jewelId"
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.number = 1
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.index = 0
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.label = 1
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.has_default_value = false
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.default_value = ""
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.type = 9
|
||||||
|
UPGRADEGODTREEREQUEST_JEWELID_FIELD.cpp_type = 9
|
||||||
|
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.name = "count"
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.full_name = ".rpc.protocols.UpgradeGodTreeRequest.count"
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.number = 2
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.index = 1
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.label = 1
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.has_default_value = false
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.default_value = 0
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.type = 5
|
||||||
|
UPGRADEGODTREEREQUEST_COUNT_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
UPGRADEGODTREEREQUEST.name = "UpgradeGodTreeRequest"
|
||||||
|
UPGRADEGODTREEREQUEST.full_name = ".rpc.protocols.UpgradeGodTreeRequest"
|
||||||
|
UPGRADEGODTREEREQUEST.nested_types = {}
|
||||||
|
UPGRADEGODTREEREQUEST.enum_types = {}
|
||||||
|
UPGRADEGODTREEREQUEST.fields = {UPGRADEGODTREEREQUEST_JEWELID_FIELD, UPGRADEGODTREEREQUEST_COUNT_FIELD}
|
||||||
|
UPGRADEGODTREEREQUEST.is_extendable = false
|
||||||
|
UPGRADEGODTREEREQUEST.extensions = {}
|
||||||
|
UPGRADEGODTREERESPONSE.name = "UpgradeGodTreeResponse"
|
||||||
|
UPGRADEGODTREERESPONSE.full_name = ".rpc.protocols.UpgradeGodTreeResponse"
|
||||||
|
UPGRADEGODTREERESPONSE.nested_types = {}
|
||||||
|
UPGRADEGODTREERESPONSE.enum_types = {}
|
||||||
|
UPGRADEGODTREERESPONSE.fields = {}
|
||||||
|
UPGRADEGODTREERESPONSE.is_extendable = false
|
||||||
|
UPGRADEGODTREERESPONSE.extensions = {}
|
||||||
|
|
||||||
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
||||||
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
||||||
|
|
@ -3418,6 +3456,8 @@ UpPracticeLevelRequest = protobuf.Message(UPPRACTICELEVELREQUEST)
|
||||||
UpPracticeLevelResponse = protobuf.Message(UPPRACTICELEVELRESPONSE)
|
UpPracticeLevelResponse = protobuf.Message(UPPRACTICELEVELRESPONSE)
|
||||||
UpQuickSoulEquipRequest = protobuf.Message(UPQUICKSOULEQUIPREQUEST)
|
UpQuickSoulEquipRequest = protobuf.Message(UPQUICKSOULEQUIPREQUEST)
|
||||||
UpSoulEquipResponse = protobuf.Message(UPSOULEQUIPRESPONSE)
|
UpSoulEquipResponse = protobuf.Message(UPSOULEQUIPRESPONSE)
|
||||||
|
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
||||||
|
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
||||||
WearGodSealRequest = protobuf.Message(WEARGODSEALREQUEST)
|
WearGodSealRequest = protobuf.Message(WEARGODSEALREQUEST)
|
||||||
WearGodSealResponse = protobuf.Message(WEARGODSEALRESPONSE)
|
WearGodSealResponse = protobuf.Message(WEARGODSEALRESPONSE)
|
||||||
XiuxianLevelUpResponse = protobuf.Message(XIUXIANLEVELUPRESPONSE)
|
XiuxianLevelUpResponse = protobuf.Message(XIUXIANLEVELUPRESPONSE)
|
||||||
|
|
|
||||||
|
|
@ -4499,6 +4499,10 @@ function this.CheckIsUpTreasure(Did,index)
|
||||||
elseif index == 2 then
|
elseif index == 2 then
|
||||||
isMax = curEquipData.refineLv == curEquipData.maxRefineLv
|
isMax = curEquipData.refineLv == curEquipData.maxRefineLv
|
||||||
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig)
|
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig)
|
||||||
|
elseif index == 3 then
|
||||||
|
isMax=curEquipData.treeLv==curEquipData.maxTreeLv
|
||||||
|
local lvUpCost= ConfigManager.GetConfigData(ConfigName.GodHoodTreeLevel,curEquipData.treeLv).LvupCost
|
||||||
|
isMatEnough=BagManager.GetItemCountById(lvUpCost[1])>=lvUpCost[2]
|
||||||
else
|
else
|
||||||
isMax = (curEquipData.lv == curEquipData.maxLv) and (curEquipData.refineLv==curEquipData.maxRefineLv)
|
isMax = (curEquipData.lv == curEquipData.maxLv) and (curEquipData.refineLv==curEquipData.maxRefineLv)
|
||||||
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig)
|
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig)
|
||||||
|
|
@ -4597,6 +4601,31 @@ function this.GetCostItems(curEquipData,_config)
|
||||||
return items,isEnough
|
return items,isEnough
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---获取装备神应等级消耗
|
||||||
|
function this.GetHoodTreeUpCost(_treeLv)
|
||||||
|
local items={}
|
||||||
|
local treeLvConfig= ConfigManager.GetConfigData(ConfigName.GodHoodTreeLevel,_treeLv)
|
||||||
|
local id=treeLvConfig.LvupCost[1]
|
||||||
|
if itemConfig[id] then
|
||||||
|
local item={}
|
||||||
|
item.id=id
|
||||||
|
item.icon=GetResourcePath(itemConfig[id].ResourceID)
|
||||||
|
item.frame=GetQuantityImageByquality(itemConfig[id].Quantity)
|
||||||
|
item.haveNum=BagManager.GetItemCountById(id)
|
||||||
|
item.needNum=treeLvConfig.LvupCost[2]
|
||||||
|
item.isEnough=item.haveNum>=item.needNum
|
||||||
|
items[1]=item
|
||||||
|
end
|
||||||
|
local isEnough = true
|
||||||
|
for k,v in pairs(items) do
|
||||||
|
if not v.isEnough then
|
||||||
|
isEnough = false
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return items,isEnough
|
||||||
|
end
|
||||||
|
|
||||||
function this.CalculatePvpBonusForShow(data)
|
function this.CalculatePvpBonusForShow(data)
|
||||||
--因为后端无法区分是否为PVP,所以前端处理,把PVP伤害加成和减免从伤害加成和减免中去除
|
--因为后端无法区分是否为PVP,所以前端处理,把PVP伤害加成和减免从伤害加成和减免中去除
|
||||||
if data[51] and data[69] then
|
if data[51] and data[69] then
|
||||||
|
|
|
||||||
|
|
@ -6859,5 +6859,23 @@ function NetManager.TowerCleanfloorRequest(func)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---建木神树升级
|
||||||
|
function NetManager.SendUpgradeGodTreeRequest(_jewelId,_count,func)
|
||||||
|
local data = HeroInfoProto_pb.UpgradeGodTreeRequest()
|
||||||
|
data.jewelId=_jewelId
|
||||||
|
data.count=_count
|
||||||
|
local msg = data:SerializeToString()
|
||||||
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.UpgradeGodTreeRequest,MessageTypeProto_pb.UpgradeGodTreeResponse,msg,function(buffer)
|
||||||
|
local data = buffer:DataByte()
|
||||||
|
local msg = HeroInfoProto_pb.UpgradeGodTreeResponse()
|
||||||
|
msg:ParseFromString(data)
|
||||||
|
EquipTreasureManager.SetEquipTreeLvByIdDyn(_jewelId)
|
||||||
|
if func then
|
||||||
|
func(msg)
|
||||||
|
end
|
||||||
|
EquipTreasureManager.SetTreasureDirty(_jewelId, true)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
return this
|
return this
|
||||||
|
|
@ -65,8 +65,10 @@ function RewardTalismanSingleShowPopup2:InitComponent()
|
||||||
self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch")
|
self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch")
|
||||||
self.btnUpgrade = Util.GetGameObject(self.btnGrid, "btnUpgrade")
|
self.btnUpgrade = Util.GetGameObject(self.btnGrid, "btnUpgrade")
|
||||||
self.btnUpstar = Util.GetGameObject(self.btnGrid, "btnUpstar")
|
self.btnUpstar = Util.GetGameObject(self.btnGrid, "btnUpstar")
|
||||||
|
self.btnShenYing = Util.GetGameObject(self.btnGrid, "btnShenYing")
|
||||||
self.upgradeRed = Util.GetGameObject(self.btnUpgrade, "red")
|
self.upgradeRed = Util.GetGameObject(self.btnUpgrade, "red")
|
||||||
self.upstarRed = Util.GetGameObject(self.btnUpstar, "red")
|
self.upstarRed = Util.GetGameObject(self.btnUpstar, "red")
|
||||||
|
self.shenyingRed = Util.GetGameObject(self.btnShenYing, "red")
|
||||||
--装备获取途径--btmBar
|
--装备获取途径--btmBar
|
||||||
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
|
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
|
||||||
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
|
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
|
||||||
|
|
@ -169,6 +171,11 @@ function RewardTalismanSingleShowPopup2:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,2)
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,2)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
Util.AddClick(self.btnShenYing, function()
|
||||||
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,3)
|
||||||
|
self:ClosePanel()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
|
@ -206,6 +213,7 @@ function RewardTalismanSingleShowPopup2:SetBtns()
|
||||||
self.btnSwitch:SetActive(self.openType == 4)
|
self.btnSwitch:SetActive(self.openType == 4)
|
||||||
self.btnUpgrade:SetActive(self.openType == 2)
|
self.btnUpgrade:SetActive(self.openType == 2)
|
||||||
self.btnUpstar:SetActive(self.openType == 2)
|
self.btnUpstar:SetActive(self.openType == 2)
|
||||||
|
self.btnShenYing:SetActive(self.openType == 2)
|
||||||
|
|
||||||
if self.equipData and self.equipData ~= 0 then
|
if self.equipData and self.equipData ~= 0 then
|
||||||
isGongMing = HarmonyManager.IsInfo(self.equipData.upHeroDid)
|
isGongMing = HarmonyManager.IsInfo(self.equipData.upHeroDid)
|
||||||
|
|
@ -293,6 +301,7 @@ function RewardTalismanSingleShowPopup2:OnShow()
|
||||||
if self.openType == 2 then
|
if self.openType == 2 then
|
||||||
self.upgradeRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,1))
|
self.upgradeRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,1))
|
||||||
self.upstarRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,2))
|
self.upstarRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,2))
|
||||||
|
self.shenyingRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,3))
|
||||||
end
|
end
|
||||||
|
|
||||||
--=============================下部=========================================
|
--=============================下部=========================================
|
||||||
|
|
|
||||||
|
|
@ -310,6 +310,7 @@ end
|
||||||
|
|
||||||
function Practice:OnShow()
|
function Practice:OnShow()
|
||||||
self.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
self.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||||
|
self.treeBtn:SetActive(false)
|
||||||
self.playerInfoView:OnShow()
|
self.playerInfoView:OnShow()
|
||||||
|
|
||||||
CheckRedPointStatus(RedPointType.Practice_imprint)
|
CheckRedPointStatus(RedPointType.Practice_imprint)
|
||||||
|
|
|
||||||
|
|
@ -32,14 +32,16 @@ function this.InitSingleTreasureData(_singleData,notAdd)
|
||||||
single.idDyn = _singleData.id
|
single.idDyn = _singleData.id
|
||||||
single.lv = _singleData.exp
|
single.lv = _singleData.exp
|
||||||
single.refineLv = _singleData.rebuildLevel
|
single.refineLv = _singleData.rebuildLevel
|
||||||
|
single.treeLv=_singleData.treeLv
|
||||||
|
single.fourSpirit=_singleData.fourSpirit
|
||||||
single.maxLv = currJewel.Max[1]
|
single.maxLv = currJewel.Max[1]
|
||||||
single.maxRefineLv = currJewel.Max[2]
|
single.maxRefineLv = currJewel.Max[2]
|
||||||
single.maxTreeLv = currJewel.GodHoodMaxlv
|
single.maxTreeLv = currJewel.GodHoodMaxlv
|
||||||
single.upHeroDid = ""
|
single.upHeroDid = ""
|
||||||
single.TreeLv = function()
|
-- single.TreeLv = function()
|
||||||
return SacredTreeManager.treeLevel <= single.maxTreeLv and SacredTreeManager.treeLevel or single.maxTreeLv
|
-- return SacredTreeManager.treeLevel <= single.maxTreeLv and SacredTreeManager.treeLevel or single.maxTreeLv
|
||||||
end
|
-- end
|
||||||
single.treeLv = single.TreeLv()
|
-- single.treeLv = single.TreeLv()
|
||||||
single.fourTotal = MonsterCampManager.GetFourElementTotalWave()
|
single.fourTotal = MonsterCampManager.GetFourElementTotalWave()
|
||||||
local quantity = currJewel.Level
|
local quantity = currJewel.Level
|
||||||
single.quantity = quantity
|
single.quantity = quantity
|
||||||
|
|
@ -482,8 +484,8 @@ end
|
||||||
function this.SetTreasureUpOrDown(_idDyn, _hero)
|
function this.SetTreasureUpOrDown(_idDyn, _hero)
|
||||||
if allTreasures[_idDyn] then
|
if allTreasures[_idDyn] then
|
||||||
allTreasures[_idDyn].upHeroDid = _hero
|
allTreasures[_idDyn].upHeroDid = _hero
|
||||||
allTreasures[_idDyn].treeLv = SacredTreeManager.treeLevel <= allTreasures[_idDyn].maxTreeLv and
|
-- allTreasures[_idDyn].treeLv = SacredTreeManager.treeLevel <= allTreasures[_idDyn].maxTreeLv and
|
||||||
SacredTreeManager.treeLevel or allTreasures[_idDyn].maxTreeLv
|
-- SacredTreeManager.treeLevel or allTreasures[_idDyn].maxTreeLv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -497,8 +499,8 @@ end
|
||||||
function this.SetEquipTreasureUpHeroDid(_equipTreasureDid, _heroDid)
|
function this.SetEquipTreasureUpHeroDid(_equipTreasureDid, _heroDid)
|
||||||
if allTreasures[_equipTreasureDid] then
|
if allTreasures[_equipTreasureDid] then
|
||||||
allTreasures[_equipTreasureDid].upHeroDid = _heroDid
|
allTreasures[_equipTreasureDid].upHeroDid = _heroDid
|
||||||
allTreasures[_equipTreasureDid].treeLv = SacredTreeManager.treeLevel <= allTreasures[_equipTreasureDid].maxTreeLv and
|
-- allTreasures[_equipTreasureDid].treeLv = SacredTreeManager.treeLevel <= allTreasures[_equipTreasureDid].maxTreeLv and
|
||||||
SacredTreeManager.treeLevel or allTreasures[_equipTreasureDid].maxTreeLv
|
-- SacredTreeManager.treeLevel or allTreasures[_equipTreasureDid].maxTreeLv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--设置装备穿戴的英雄
|
--设置装备穿戴的英雄
|
||||||
|
|
@ -597,6 +599,12 @@ function this.SetAllTreasureDirty(isDirty)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.SetEquipTreeLvByIdDyn(_idDyn)
|
||||||
|
if allTreasures[_idDyn] then
|
||||||
|
allTreasures[_idDyn].treeLv=allTreasures[_idDyn].treeLv+1
|
||||||
|
end
|
||||||
|
end
|
||||||
-- 设置宝物战斗力
|
-- 设置宝物战斗力
|
||||||
function this.SetTreasurePower(dId, power)
|
function this.SetTreasurePower(dId, power)
|
||||||
if not this.TreasurePowerData then
|
if not this.TreasurePowerData then
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ function EquipTreasureStrongPopup:InitComponent()
|
||||||
this.itemPre = Util.GetGameObject(this.content,"itemView")
|
this.itemPre = Util.GetGameObject(this.content,"itemView")
|
||||||
this.firstScroll=Util.GetGameObject(this.content,"firstScroll")
|
this.firstScroll=Util.GetGameObject(this.content,"firstScroll")
|
||||||
this.secondScroll=Util.GetGameObject(this.content,"secondScroll")
|
this.secondScroll=Util.GetGameObject(this.content,"secondScroll")
|
||||||
this.properItemPre = Util.GetGameObject( this.secondScroll,"propertyPre")
|
this.properItemPre = Util.GetGameObject( this.content,"propertyPre")
|
||||||
this.propertyGrid=Util.GetGameObject(this.secondScroll,"grid")
|
this.propertyGrid=Util.GetGameObject(this.secondScroll,"grid")
|
||||||
this.costItemPre=Util.GetGameObject(this.content,"costItemPre")
|
this.costItemPre=Util.GetGameObject(this.content,"costItemPre")
|
||||||
this.costPreList = {}
|
this.costPreList = {}
|
||||||
|
|
@ -34,10 +34,14 @@ function EquipTreasureStrongPopup:InitComponent()
|
||||||
this.btnRefineText = Util.GetGameObject(this.btnRefine,"Text"):GetComponent("Text")
|
this.btnRefineText = Util.GetGameObject(this.btnRefine,"Text"):GetComponent("Text")
|
||||||
this.btnStrong=Util.GetGameObject(this.btnGrid,"btnStrong")
|
this.btnStrong=Util.GetGameObject(this.btnGrid,"btnStrong")
|
||||||
this.btnStrongText = Util.GetGameObject(this.btnStrong,"Text"):GetComponent("Text")
|
this.btnStrongText = Util.GetGameObject(this.btnStrong,"Text"):GetComponent("Text")
|
||||||
|
this.btnShenying=Util.GetGameObject(this.btnGrid,"btnShenying")
|
||||||
|
this.btnShenyingText = Util.GetGameObject(this.btnShenying,"Text"):GetComponent("Text")
|
||||||
this.btn_strongPage=Util.GetGameObject(this.content,"btnList/btnStrong")
|
this.btn_strongPage=Util.GetGameObject(this.content,"btnList/btnStrong")
|
||||||
this.btn_refinePage=Util.GetGameObject(this.content,"btnList/btnRefine")
|
this.btn_refinePage=Util.GetGameObject(this.content,"btnList/btnRefine")
|
||||||
|
this.btn_shenyingPage=Util.GetGameObject(this.content,"btnList/btnShenying")
|
||||||
this.btn_strongPageRed=Util.GetGameObject(this.btn_strongPage,"red")
|
this.btn_strongPageRed=Util.GetGameObject(this.btn_strongPage,"red")
|
||||||
this.btn_refinePageRed=Util.GetGameObject(this.btn_refinePage,"red")
|
this.btn_refinePageRed=Util.GetGameObject(this.btn_refinePage,"red")
|
||||||
|
this.btn_shenyingPageRed=Util.GetGameObject(this.btn_shenyingPage,"red")
|
||||||
this.selectBtn=Util.GetGameObject(this.content,"btnList/selectBtn")
|
this.selectBtn=Util.GetGameObject(this.content,"btnList/selectBtn")
|
||||||
this.selectText = Util.GetGameObject(this.selectBtn,"Text"):GetComponent("Text")
|
this.selectText = Util.GetGameObject(this.selectBtn,"Text"):GetComponent("Text")
|
||||||
this.treasureDatas = {}
|
this.treasureDatas = {}
|
||||||
|
|
@ -80,6 +84,16 @@ function EquipTreasureStrongPopup:BindEvent()
|
||||||
this:SetWindShow(2,0)
|
this:SetWindShow(2,0)
|
||||||
this:RefreshRedPoint(0,false)
|
this:RefreshRedPoint(0,false)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--神应页签
|
||||||
|
Util.AddClick(this.btn_shenyingPage, function()
|
||||||
|
if type == 3 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
this:SetWindShow(3,0)
|
||||||
|
-- this:RefreshRedPoint(0,false)
|
||||||
|
end)
|
||||||
|
|
||||||
--强化按钮
|
--强化按钮
|
||||||
Util.AddClick(this.btnStrong, function()
|
Util.AddClick(this.btnStrong, function()
|
||||||
if isGongMing then
|
if isGongMing then
|
||||||
|
|
@ -185,6 +199,21 @@ function EquipTreasureStrongPopup:BindEvent()
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--神应按钮
|
||||||
|
Util.AddClick(this.btnShenying, function()
|
||||||
|
NetManager.SendUpgradeGodTreeRequest(curEquipData.idDyn,1,function (msg)
|
||||||
|
PopupTipPanel.ShowTip("升级成功")
|
||||||
|
this:SetWindShow(type)
|
||||||
|
this.treasureDatas[curIndex]:OnOpen(false, {curEquipData.id,0}, 1, false, false, false, 0,curEquipData.idDyn)
|
||||||
|
this:RefreshRedPoint(0,true)
|
||||||
|
local oldWarPowerValue = EquipTreasureManager.CalculateWarForceBySid(curEquipData.id,curEquipData.lv ,curEquipData.refineLv - 1,curEquipData.treeLv)
|
||||||
|
local newWarPowerValue = EquipTreasureManager.CalculateWarForceBySid(curEquipData.id,curEquipData.lv,curEquipData.refineLv,curEquipData.treeLv)
|
||||||
|
if oldWarPowerValue ~= newWarPowerValue then
|
||||||
|
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPowerValue,newValue = newWarPowerValue})
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function EquipTreasureStrongPopup:RefreshRedPoint(delta,isRefreshTabRed)
|
function EquipTreasureStrongPopup:RefreshRedPoint(delta,isRefreshTabRed)
|
||||||
|
|
@ -195,28 +224,34 @@ function EquipTreasureStrongPopup:RefreshRedPoint(delta,isRefreshTabRed)
|
||||||
end
|
end
|
||||||
this.select.transform:SetParent(curIndex.transform)
|
this.select.transform:SetParent(curIndex.transform)
|
||||||
this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,5.04,0)
|
this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,5.04,0)
|
||||||
this.selectText.text = type == 1 and "强 化" or "精 炼"
|
if type==1 then
|
||||||
|
this.selectText.text="强 化"
|
||||||
|
elseif type==2 then
|
||||||
|
this.selectText.text="精 炼"
|
||||||
|
else
|
||||||
|
this.selectText.text="神 应"
|
||||||
|
end
|
||||||
|
-- this.selectText.text = type == 1 and "强 化" or "精 炼"
|
||||||
this.select.transform.localScale = Vector3.one
|
this.select.transform.localScale = Vector3.one
|
||||||
this.select.gameObject:SetActive(true)
|
this.select.gameObject:SetActive(true)
|
||||||
this.select.transform:SetSiblingIndex(1)
|
this.select.transform:SetSiblingIndex(1)
|
||||||
end,delta):Start()
|
end,delta):Start()
|
||||||
if isRefreshTabRed then
|
if isRefreshTabRed then
|
||||||
local redDataStrong ,redDataRefine = false,false
|
local redDataStrong ,redDataRefine,redDataShenying = false,false,false
|
||||||
for k,v in pairs(datas) do
|
for k,v in pairs(datas) do
|
||||||
if redDataStrong and redDataRefine then
|
if not redDataStrong then
|
||||||
break
|
|
||||||
end
|
|
||||||
if redDataStrong then
|
|
||||||
else
|
|
||||||
redDataStrong = HeroManager.CheckIsUpTreasure(v.idDyn,1)
|
redDataStrong = HeroManager.CheckIsUpTreasure(v.idDyn,1)
|
||||||
end
|
end
|
||||||
if redDataRefine then
|
if not redDataRefine then
|
||||||
else
|
|
||||||
redDataRefine = HeroManager.CheckIsUpTreasure(v.idDyn,2)
|
redDataRefine = HeroManager.CheckIsUpTreasure(v.idDyn,2)
|
||||||
end
|
end
|
||||||
|
if not redDataShenying then
|
||||||
|
redDataShenying = HeroManager.CheckIsUpTreasure(v.idDyn,3)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
this.btn_strongPageRed.gameObject:SetActive(redDataStrong)
|
this.btn_strongPageRed.gameObject:SetActive(redDataStrong)
|
||||||
this.btn_refinePageRed.gameObject:SetActive(redDataRefine)
|
this.btn_refinePageRed.gameObject:SetActive(redDataRefine)
|
||||||
|
this.btn_shenyingPageRed.gameObject:SetActive(redDataRefine)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -316,7 +351,7 @@ function EquipTreasureStrongPopup:SetScrollPre(go,data,_index)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
--设置界面显示 1.强化 2.精炼
|
--设置界面显示 1.强化 2.精炼 3.神应
|
||||||
function EquipTreasureStrongPopup:SetWindShow(_index)
|
function EquipTreasureStrongPopup:SetWindShow(_index)
|
||||||
haveTreasures = {}
|
haveTreasures = {}
|
||||||
type = _index
|
type = _index
|
||||||
|
|
@ -326,6 +361,7 @@ function EquipTreasureStrongPopup:SetWindShow(_index)
|
||||||
this.titleTxt.text = Language[11775]
|
this.titleTxt.text = Language[11775]
|
||||||
this.btnRefine:SetActive(false)
|
this.btnRefine:SetActive(false)
|
||||||
this.btnStrong:SetActive(true)
|
this.btnStrong:SetActive(true)
|
||||||
|
this.btnShenying:SetActive(false)
|
||||||
this.SetBtnSelect(this.btn_strongPage)
|
this.SetBtnSelect(this.btn_strongPage)
|
||||||
isMax = curEquipData.lv == curEquipData.maxLv
|
isMax = curEquipData.lv == curEquipData.maxLv
|
||||||
this.properList[0].leftTxt.text = "强化等级"
|
this.properList[0].leftTxt.text = "强化等级"
|
||||||
|
|
@ -345,10 +381,11 @@ function EquipTreasureStrongPopup:SetWindShow(_index)
|
||||||
this.hintTxt.text = Language[11778]
|
this.hintTxt.text = Language[11778]
|
||||||
end
|
end
|
||||||
|
|
||||||
else
|
elseif _index == 2 then
|
||||||
this.titleTxt.text=Language[11779]
|
this.titleTxt.text=Language[11779]
|
||||||
this.btnRefine:SetActive(true)
|
this.btnRefine:SetActive(true)
|
||||||
this.btnStrong:SetActive(false)
|
this.btnStrong:SetActive(false)
|
||||||
|
this.btnShenying:SetActive(false)
|
||||||
this.SetBtnSelect(this.btn_refinePage)
|
this.SetBtnSelect(this.btn_refinePage)
|
||||||
isMax=curEquipData.refineLv==curEquipData.maxRefineLv
|
isMax=curEquipData.refineLv==curEquipData.maxRefineLv
|
||||||
this.properList[0].leftTxt.text = "精炼等级"
|
this.properList[0].leftTxt.text = "精炼等级"
|
||||||
|
|
@ -366,6 +403,29 @@ function EquipTreasureStrongPopup:SetWindShow(_index)
|
||||||
else
|
else
|
||||||
this.hintTxt.text=Language[11782]
|
this.hintTxt.text=Language[11782]
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
this.titleTxt.text="神应"
|
||||||
|
this.btnRefine:SetActive(false)
|
||||||
|
this.btnStrong:SetActive(false)
|
||||||
|
this.btnShenying:SetActive(true)
|
||||||
|
this.SetBtnSelect(this.btn_shenyingPage)
|
||||||
|
isMax=curEquipData.treeLv==curEquipData.maxTreeLv
|
||||||
|
this.properList[0].leftTxt.text = "神应等级"..curEquipData.treeLv
|
||||||
|
if isMax then
|
||||||
|
this.properList[0].rightTxt.text = Language[11062]
|
||||||
|
this.btnRefine.gameObject:SetActive(false)
|
||||||
|
else
|
||||||
|
this.btnShenyingText.text="升 级"
|
||||||
|
this.properList[0].rightTxt.text = curEquipData.treeLv+1
|
||||||
|
end
|
||||||
|
propertyShow = SacredTreeManager.GetPropText(curEquipData.treeLv,curEquipData.quantity-1)
|
||||||
|
items = HeroManager.GetHoodTreeUpCost(curEquipData.treeLv)
|
||||||
|
if isMax then
|
||||||
|
this.hintTxt.text = "神应等级已达上限"
|
||||||
|
else
|
||||||
|
this.hintTxt.text=Language[11782]
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
isGongMing = false
|
isGongMing = false
|
||||||
--if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 and _index == 1 then
|
--if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 and _index == 1 then
|
||||||
|
|
@ -424,13 +484,10 @@ function EquipTreasureStrongPopup:CostShow(items)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--设置属性的显示
|
--设置属性的显示
|
||||||
function EquipTreasureStrongPopup:SetPropertyShow(_infos)
|
function EquipTreasureStrongPopup:SetPropertyShow(_infos)
|
||||||
if this.hintTxt.gameObject.activeInHierarchy then
|
if this.hintTxt.gameObject.activeInHierarchy then
|
||||||
this.properList[0].go.gameObject:SetActive(false)
|
-- this.properList[0].go.gameObject:SetActive(false)
|
||||||
this.propertyGrid.gameObject:SetActive(false)
|
this.propertyGrid.gameObject:SetActive(false)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -234,6 +234,7 @@ function RoleEquipPanel:OnOpen(...)
|
||||||
end
|
end
|
||||||
function RoleEquipPanel:OnShow()
|
function RoleEquipPanel:OnShow()
|
||||||
this.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
this.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||||
|
this.treeBtn:SetActive(false)
|
||||||
isPlayAnim = true
|
isPlayAnim = true
|
||||||
for i = 1, #heroListData do
|
for i = 1, #heroListData do
|
||||||
if curHeroData == heroListData[i] then
|
if curHeroData == heroListData[i] then
|
||||||
|
|
|
||||||
|
|
@ -138,13 +138,13 @@ function this.GetCurLvPropertyValue(_type, _id, _lv)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.CheckRedPoint()
|
function this.CheckRedPoint()
|
||||||
if treeLevelConfig[this.treeLevel].LvupCost and #treeLevelConfig[this.treeLevel].LvupCost > 0 then
|
-- if treeLevelConfig[this.treeLevel].LvupCost and #treeLevelConfig[this.treeLevel].LvupCost > 0 then
|
||||||
local needId = treeLevelConfig[this.treeLevel].LvupCost[1]
|
-- local needId = treeLevelConfig[this.treeLevel].LvupCost[1]
|
||||||
local needCost = treeLevelConfig[this.treeLevel].LvupCost[2]
|
-- local needCost = treeLevelConfig[this.treeLevel].LvupCost[2]
|
||||||
return BagManager.GetTotalItemNum(needId) > needCost
|
-- return BagManager.GetTotalItemNum(needId) > needCost
|
||||||
else
|
-- else
|
||||||
return false
|
-- return false
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
--获取当前等级和下一级的数据
|
--获取当前等级和下一级的数据
|
||||||
|
|
@ -183,4 +183,46 @@ function this.GetAttriDetail(index)
|
||||||
end
|
end
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--获取当前等级和下一级的数据
|
||||||
|
function this.GetPropText(_treeLv,index)
|
||||||
|
local data = {}
|
||||||
|
local maxSacredLevel = ConfigManager.GetConfigDataByKey(ConfigName.JewelConfig,"GodHoodPool",index).GodHoodMaxlv
|
||||||
|
local level = _treeLv
|
||||||
|
local configData = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",3,"Level",level,"PoolID",index)
|
||||||
|
local configNextData = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",3,"Level",level+1,"PoolID",index)
|
||||||
|
if _treeLv >= maxSacredLevel then--如果当前神树等级超出魂灵宝所能达到的最大等级就取最大
|
||||||
|
configNextData = nil
|
||||||
|
end
|
||||||
|
-- LogRed("#configData.Property:"..tostring(#configData.Property))
|
||||||
|
for i = 1, #configData.Property do
|
||||||
|
local bool = MonsterCampManager.GetFourElementTotalWave() >= ClientAttriData[i][2]
|
||||||
|
local color1 = bool and "#F3D98F" or "#A0A0A0"--是否解锁了当前属性
|
||||||
|
local color2 = bool and "#00FF00" or "#A0A0A0"--是否解锁了当前属性
|
||||||
|
local propArr=configData.Property[i]
|
||||||
|
local propId=propArr[1]
|
||||||
|
data[propId] = {}
|
||||||
|
data[propId].currValue = propArr[2]
|
||||||
|
-- if PropertyConfig[propArr[1]].Style == 1 then
|
||||||
|
-- data[propId].currValue = propArr[2]
|
||||||
|
-- elseif PropertyConfig[propArr[1]].Style == 2 then
|
||||||
|
-- data[propId].currValue = propArr[2]
|
||||||
|
-- end
|
||||||
|
-- LogPink("configNextData:"..tostring(configNextData))
|
||||||
|
if configNextData then
|
||||||
|
local nextPropArr=configNextData.Property[i]
|
||||||
|
data[propId].nextValue = nextPropArr[2]
|
||||||
|
-- if PropertyConfig[nextPropArr[1]].Style == 1 then
|
||||||
|
-- data[propId].nextValue = nextPropArr[2] - propArr[2]
|
||||||
|
-- elseif PropertyConfig[nextPropArr[1]].Style == 2 then
|
||||||
|
-- data[propId].nextValue = nextPropArr[2] - propArr[2]
|
||||||
|
-- end
|
||||||
|
else
|
||||||
|
local color = not bool and "A0A0A0" or "F3D98F"
|
||||||
|
data[propId].nextValue = string.format("<color=#%s>已达上限</color>",color)
|
||||||
|
end
|
||||||
|
-- LogGreen(data[i].text1.." "..data[i].text2)
|
||||||
|
end
|
||||||
|
return data
|
||||||
|
end
|
||||||
return this
|
return this
|
||||||
Loading…
Reference in New Issue