Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
19d4f27f76
|
@ -4703,6 +4703,80 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &309185893934019837
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 276485737548280371}
|
||||
- component: {fileID: 7713586852100879263}
|
||||
- component: {fileID: 1607087953477200490}
|
||||
m_Layer: 5
|
||||
m_Name: red
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &276485737548280371
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 309185893934019837}
|
||||
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: 610946329444731356}
|
||||
m_RootOrder: 6
|
||||
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: 45, y: 60}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7713586852100879263
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 309185893934019837}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1607087953477200490
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 309185893934019837}
|
||||
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 &535413429869230351
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -14819,6 +14893,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1659001819506129001
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1151656424564009157}
|
||||
- component: {fileID: 2447857755498794254}
|
||||
- component: {fileID: 1915144280324361988}
|
||||
m_Layer: 5
|
||||
m_Name: red
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1151656424564009157
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1659001819506129001}
|
||||
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: 1660741850867074862}
|
||||
m_RootOrder: 6
|
||||
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: 45, y: 60}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2447857755498794254
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1659001819506129001}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1915144280324361988
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1659001819506129001}
|
||||
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 &1718392016004540180
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -19814,6 +19962,7 @@ RectTransform:
|
|||
- {fileID: 8297531556104286633}
|
||||
- {fileID: 8032084402353647845}
|
||||
- {fileID: 1476100193821676408}
|
||||
- {fileID: 4251900228633604894}
|
||||
m_Father: {fileID: 627347790913322735}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -19996,6 +20145,80 @@ MonoBehaviour:
|
|||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &2272835869068843628
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6171904571588855262}
|
||||
- component: {fileID: 3677326642243182382}
|
||||
- component: {fileID: 7215513836417358325}
|
||||
m_Layer: 5
|
||||
m_Name: red
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6171904571588855262
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2272835869068843628}
|
||||
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: 3798012906017567417}
|
||||
m_RootOrder: 6
|
||||
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: 45, y: 60}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3677326642243182382
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2272835869068843628}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7215513836417358325
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2272835869068843628}
|
||||
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 &2440763176831511625
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -20070,6 +20293,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2558843021868054554
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4251900228633604894}
|
||||
- component: {fileID: 5268386073289739881}
|
||||
- component: {fileID: 4899243540210467880}
|
||||
m_Layer: 5
|
||||
m_Name: red
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4251900228633604894
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2558843021868054554}
|
||||
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: 8714706326752686439}
|
||||
m_RootOrder: 6
|
||||
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: 45, y: 60}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5268386073289739881
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2558843021868054554}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4899243540210467880
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2558843021868054554}
|
||||
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 &2585207949275853681
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -56573,6 +56870,7 @@ RectTransform:
|
|||
- {fileID: 2554690622748748508}
|
||||
- {fileID: 184005518999025904}
|
||||
- {fileID: 4801301434298079491}
|
||||
- {fileID: 276485737548280371}
|
||||
m_Father: {fileID: 627347790913322735}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -56696,6 +56994,7 @@ RectTransform:
|
|||
- {fileID: 8069293076258639939}
|
||||
- {fileID: 2438658025886992659}
|
||||
- {fileID: 5636211642239049033}
|
||||
- {fileID: 1151656424564009157}
|
||||
m_Father: {fileID: 627347790913322735}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -66962,6 +67261,7 @@ RectTransform:
|
|||
- {fileID: 5553806812663769513}
|
||||
- {fileID: 8794351257058703392}
|
||||
- {fileID: 378093594673622862}
|
||||
- {fileID: 6171904571588855262}
|
||||
m_Father: {fileID: 627347790913322735}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
@ -10654,6 +10654,80 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u795E \u5C06"
|
||||
LanguageIndex: 11340
|
||||
--- !u!1 &6118760938439587115
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9007702205527818056}
|
||||
- component: {fileID: 6860873103243563548}
|
||||
- component: {fileID: 6081184618543777355}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9007702205527818056
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6118760938439587115}
|
||||
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: 8922693733861763146}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 101.7, y: 22.8}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6860873103243563548
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6118760938439587115}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6081184618543777355
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6118760938439587115}
|
||||
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 &6619027786620374622
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -15446,6 +15520,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 423493204652919967}
|
||||
- {fileID: 9007702205527818056}
|
||||
m_Father: {fileID: 8081419371287439877}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
@ -974,8 +974,8 @@ RedPointType = {
|
|||
Practice_Cultivation = 5004,--主角修为
|
||||
playerSkill1 = 5100,--主角1技能
|
||||
playerSkill2 = 5200,--主角2技能
|
||||
playerSkill2 = 5300,--主角3技能
|
||||
playerSkill2 = 5400,--主角4技能
|
||||
playerSkill3 = 5300,--主角3技能
|
||||
playerSkill4 = 5400,--主角4技能
|
||||
wujinMission = 8500,
|
||||
wujinTreasure = 8501,
|
||||
wujinBianDui = 8502,
|
||||
|
|
|
@ -311,8 +311,11 @@ function this.InitRedPointAllRelate()
|
|||
-- 山河社稷图
|
||||
RPData:SetParent(RedPointType.FightLevelBoxReward, RedPointType.FightLevel)
|
||||
RPData:SetParent(RedPointType.FightLevelDailyReward, RedPointType.FightLevel)
|
||||
|
||||
|
||||
--主角技能
|
||||
RPData:SetParent(RedPointType.playerSkill1,RedPointType.Practice)
|
||||
RPData:SetParent(RedPointType.playerSkill2,RedPointType.Practice)
|
||||
RPData:SetParent(RedPointType.playerSkill3,RedPointType.Practice)
|
||||
RPData:SetParent(RedPointType.playerSkill4,RedPointType.Practice)
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
|
||||
if v.RpType > 0 and v.RpTypeParent > 0 then
|
||||
RPData:SetParent(v.RpType,v.RpTypeParent)
|
||||
|
@ -587,8 +590,10 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
|
||||
--御剑行
|
||||
RPData:AddCheckFunc(RedPointType.YuJianXingMian,YuJianXingManager.CheckRedPoint)
|
||||
--新百宝商会
|
||||
RPData:AddCheckFunc(RedPointType.TreasureStoreSeason2,ActivityGiftManager.TreasureStoreSeason2RedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill1, PracticeManager.CheckPlayerSkillRed)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill2, PracticeManager.CheckPlayerSkillRed)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill3, PracticeManager.CheckPlayerSkillRed)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill4, PracticeManager.CheckPlayerSkillRed)
|
||||
end
|
||||
|
||||
-- 向红点绑定物体
|
||||
|
|
|
@ -4,7 +4,6 @@ local XiuXianConfig = ConfigManager.GetConfig(ConfigName.XiuXianConfig)
|
|||
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
|
||||
local SkillBaseConfig= ConfigManager.GetConfig(ConfigName.PlayerSkillBasicTable)
|
||||
|
||||
function this.Initialize()
|
||||
this.PracticeLevel = 1--小境界id
|
||||
this.PracticeBigLevel = 1--大境界数
|
||||
|
@ -36,7 +35,6 @@ function this.UpdataPlayerSkill(msg)
|
|||
LogError("msg id=="..msg[i].skillId.." vlaue =="..msg[i].skillLv)
|
||||
if this.playerSkillList[msg[i].skillId] then
|
||||
this.playerSkillList[msg[i].skillId]=msg[i].skillLv
|
||||
LogError("////////////")
|
||||
end
|
||||
end
|
||||
-- for key, value in pairs(msg) do
|
||||
|
@ -63,10 +61,41 @@ function this.AddPlayerSkill(lv)
|
|||
for i = 1, #XiuXianConfig[lv].PlayerSkill do
|
||||
LogError("add=========="..XiuXianConfig[lv].PlayerSkill[i])
|
||||
this.playerSkillList[XiuXianConfig[lv].PlayerSkill[i]]=1
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."playerSkillRed",XiuXianConfig[lv].PlayerSkill[i])
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
--检测主角技能红点
|
||||
function this.CheckPlayerSkillRed(redType)
|
||||
local id=redType-5000
|
||||
local lv=this.playerSkillList[id]
|
||||
local openId=PlayerPrefs.GetInt(PlayerManager.uid.."playerSkillRed")
|
||||
if openId==id then
|
||||
return true
|
||||
end
|
||||
if lv~=0 then
|
||||
local currData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",lv)
|
||||
local nextData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",lv+1)
|
||||
if nextData then
|
||||
local isShow=true
|
||||
for i = 1, #currData.LvupCost do
|
||||
if BagManager.GetItemCountById(currData.LvupCost[i][1])<currData.LvupCost[i][2] then
|
||||
isShow=false
|
||||
end
|
||||
end
|
||||
LogError(" "..tostring(isShow))
|
||||
return isShow
|
||||
else
|
||||
LogError(" 111111111111111111111111")
|
||||
return false
|
||||
end
|
||||
end
|
||||
LogError(" 222222222")
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
--从服务器更新当前修行等级
|
||||
|
|
|
@ -70,6 +70,7 @@ function Practice:InitComponent()
|
|||
self.skillList={}
|
||||
for i = 1, 4 do
|
||||
table.insert(self.skillList,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i))
|
||||
BindRedPointObject(5000+i*100,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -223,11 +224,16 @@ function Practice:OnOpen()
|
|||
end
|
||||
--设置技能信息显示
|
||||
function Practice:SetSkillInfo()
|
||||
CheckRedPointStatus(RedPointType.playerSkill1)
|
||||
CheckRedPointStatus(RedPointType.playerSkill2)
|
||||
CheckRedPointStatus(RedPointType.playerSkill3)
|
||||
CheckRedPointStatus(RedPointType.playerSkill4)
|
||||
local list=PracticeManager.GetSkillInfo()
|
||||
local index=1
|
||||
for i = 100, 400,100 do
|
||||
local item=self.skillList[index]
|
||||
Util.GetGameObject(item, "icon"):GetComponent("Image").sprite=self.spLoader:LoadSprite(GetResourcePath(tonumber(SkillBaseConfig[i].Icon)))
|
||||
--Util.GetGameObject(item, "red"):SetActive(false)
|
||||
if list[i] and list[i]~=0 then
|
||||
Util.GetGameObject(item, "mask"):SetActive(false)
|
||||
Util.GetGameObject(item, "Text"):SetActive(true)
|
||||
|
@ -265,6 +271,7 @@ end
|
|||
function Practice:OnShow()
|
||||
self.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||
self.playerInfoView:OnShow()
|
||||
|
||||
CheckRedPointStatus(RedPointType.Practice_imprint)
|
||||
CheckRedPointStatus(RedPointType.Practice_upgrade)
|
||||
CheckRedPointStatus(RedPointType.Practice_fourQua)
|
||||
|
@ -439,6 +446,10 @@ function Practice:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.Practice_imprint,self.imprintRedPoint)
|
||||
ClearRedPointObject(RedPointType.Practice_fourQua,self.fourQuadrantRedPoint)
|
||||
ClearRedPointObject(RedPointType.Practice_Cultivation,self.cultivationRed)
|
||||
for i = 1, 4 do
|
||||
-- table.insert(self.skillList,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i))
|
||||
ClearRedPointObject(500+i*100,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
self.itemList = {}
|
||||
self.skillList={}
|
||||
self.pointList = {}
|
||||
|
|
|
@ -19,6 +19,7 @@ function PracticeSkillInfoPanel:InitComponent()
|
|||
self.btn_up=Util.GetGameObject(self.gameObject, "bg/btn")
|
||||
self.btn_close=Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||
self.btn_info=Util.GetGameObject(self.gameObject, "bg/btn/Text"):GetComponent("Text")
|
||||
self.redPoint=Util.GetGameObject(self.gameObject, "bg/btn/Image")
|
||||
end
|
||||
|
||||
function PracticeSkillInfoPanel:BindEvent()
|
||||
|
@ -49,6 +50,10 @@ end
|
|||
|
||||
local currLv=0
|
||||
function PracticeSkillInfoPanel:OnOpen(id,lv)
|
||||
local setId=PlayerPrefs.GetInt(PlayerManager.uid.."playerSkillRed",0)
|
||||
if setId==id then
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."playerSkillRed",0)
|
||||
end
|
||||
PracticeSkillInfoPanel:RefreshShow(id,lv)
|
||||
end
|
||||
|
||||
|
@ -68,6 +73,7 @@ function PracticeSkillInfoPanel:RefreshShow(id,lv)
|
|||
self.skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(currData.Icon))
|
||||
self.titleTxt.text=currData.Name
|
||||
self.skillLv.text=currLv
|
||||
self.redPoint:SetActive(false)
|
||||
--没有下一等级
|
||||
if not nextData then
|
||||
self.nextInfo.gameObject:SetActive(false)
|
||||
|
@ -105,6 +111,7 @@ function PracticeSkillInfoPanel:RefreshShow(id,lv)
|
|||
if BagManager.GetItemCountById(currData.LvupCost[1][1])>=currData.LvupCost[1][2] then
|
||||
self.costNum.color=UIColor.WRITE
|
||||
btnState=3 --可以点击
|
||||
self.redPoint:SetActive(true)
|
||||
else
|
||||
self.costNum.color=UIColor.RED
|
||||
btnState=4 --货币不足
|
||||
|
|
Loading…
Reference in New Issue