jiaoyangna 2020-10-15 14:16:57 +08:00
parent 864535ca9b
commit e12a075e2c
12 changed files with 1451 additions and 498 deletions

View File

@ -3079,6 +3079,147 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u589E\u52A0\u79EF\u5206"
LanguageIndex: 11025
--- !u!1 &1779438307888641671
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8194028168658007007}
- component: {fileID: 3922034943202533060}
- component: {fileID: 826059860797973227}
- component: {fileID: 5645020203855000391}
m_Layer: 5
m_Name: InputField
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8194028168658007007
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779438307888641671}
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: 5715885997046619809}
- {fileID: 8722140932495146243}
m_Father: {fileID: 4506931184221746536}
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: -688.5, y: -89.476006}
m_SizeDelta: {x: 326, y: 63}
m_Pivot: {x: -0.34126154, y: -0.9202117}
--- !u!222 &3922034943202533060
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779438307888641671}
m_CullTransparentMesh: 0
--- !u!114 &826059860797973227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779438307888641671}
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: 10911, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5645020203855000391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779438307888641671}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 575553740, 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: 826059860797973227}
m_TextComponent: {fileID: 5416015746079411619}
m_Placeholder: {fileID: 7069115104674456207}
m_ContentType: 0
m_InputType: 0
m_AsteriskChar: 42
m_KeyboardType: 0
m_LineType: 0
m_HideMobileInput: 0
m_CharacterValidation: 0
m_CharacterLimit: 0
m_OnEndEdit:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
m_Text:
m_CaretBlinkRate: 0.85
m_CaretWidth: 1
m_ReadOnly: 0
--- !u!1 &1810136214547058380
GameObject:
m_ObjectHideFlags: 0
@ -6337,6 +6478,7 @@ RectTransform:
- {fileID: 5822293589221699232}
- {fileID: 1087313334}
- {fileID: 904840898}
- {fileID: 4506931184221746536}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -12782,6 +12924,86 @@ MonoBehaviour:
m_CaretBlinkRate: 0.85
m_CaretWidth: 1
m_ReadOnly: 0
--- !u!1 &2428903093230897057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2185434835492118100}
- component: {fileID: 7019836114733607235}
- component: {fileID: 5730594274885876155}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2185434835492118100
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2428903093230897057}
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: 2996870899490543600}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7019836114733607235
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2428903093230897057}
m_CullTransparentMesh: 0
--- !u!114 &5730594274885876155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2428903093230897057}
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.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u900D\u9065\u6E38gm"
LanguageIndex: 11027
--- !u!1 &2726687261497522543
GameObject:
m_ObjectHideFlags: 0
@ -13712,6 +13934,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5173\u5361id"
LanguageIndex: 10997
--- !u!1 &4462244839922941030
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5715885997046619809}
- component: {fileID: 7714596055921217334}
- component: {fileID: 7069115104674456207}
m_Layer: 5
m_Name: Placeholder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5715885997046619809
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462244839922941030}
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: 8194028168658007007}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 5, y: 3}
m_SizeDelta: {x: -10, y: -6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7714596055921217334
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462244839922941030}
m_CullTransparentMesh: 0
--- !u!114 &7069115104674456207
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4462244839922941030}
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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 28
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "24#\u7C7B\u578B#mapId#bossId"
LanguageIndex: 11026
--- !u!1 &4473781719376956531
GameObject:
m_ObjectHideFlags: 0
@ -15143,6 +15445,240 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &8371434975632087747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2996870899490543600}
- component: {fileID: 7429756641078218926}
- component: {fileID: 9125996942868884653}
- component: {fileID: 594755996303428267}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2996870899490543600
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371434975632087747}
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: 2185434835492118100}
m_Father: {fileID: 4506931184221746536}
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: -164, y: -0.0011673}
m_SizeDelta: {x: 144, y: 63.003}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7429756641078218926
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371434975632087747}
m_CullTransparentMesh: 0
--- !u!114 &9125996942868884653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371434975632087747}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &594755996303428267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371434975632087747}
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: 9125996942868884653}
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 &8602747017647771888
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8722140932495146243}
- component: {fileID: 3823102184651116719}
- component: {fileID: 5416015746079411619}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8722140932495146243
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8602747017647771888}
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: 8194028168658007007}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -5, y: 3}
m_SizeDelta: {x: -10, y: -6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3823102184651116719
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8602747017647771888}
m_CullTransparentMesh: 0
--- !u!114 &5416015746079411619
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8602747017647771888}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &8659513055957269635
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4506931184221746536}
m_Layer: 5
m_Name: xiaoyaoyou
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4506931184221746536
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8659513055957269635}
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: 8194028168658007007}
- {fileID: 2996870899490543600}
m_Father: {fileID: 2257205713042167254}
m_RootOrder: 20
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: 482.80005, y: -582}
m_SizeDelta: {x: 749.8, y: 82.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8715181316132175954
GameObject:
m_ObjectHideFlags: 0

View File

@ -594,7 +594,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2700222768937658443}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -846,9 +846,8 @@ RectTransform:
- {fileID: 5797844118260333372}
- {fileID: 6930919416826740254}
- {fileID: 2793905207867123014}
- {fileID: 6539290600892711698}
m_Father: {fileID: 2700222768937658443}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1131,7 +1130,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4396471659944688024
--- !u!1 &3923347955883958669
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1139,50 +1138,51 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3912465624479060842}
- component: {fileID: 4150182727686703201}
- component: {fileID: 3201843698466403845}
- component: {fileID: 6749790826617255168}
- component: {fileID: 1308279042142355611}
- component: {fileID: 5223356675483903234}
m_Layer: 5
m_Name: Image
m_Name: choosed
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3912465624479060842
--- !u!224 &6749790826617255168
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4396471659944688024}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_GameObject: {fileID: 3923347955883958669}
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: 6539290600892711698}
m_Children:
- {fileID: 8024944888678983175}
m_Father: {fileID: 2700222768937658443}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 144, y: 144}
m_AnchoredPosition: {x: -1453, y: 476}
m_SizeDelta: {x: 142.38, y: 143.14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4150182727686703201
--- !u!222 &1308279042142355611
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4396471659944688024}
m_GameObject: {fileID: 3923347955883958669}
m_CullTransparentMesh: 0
--- !u!114 &3201843698466403845
--- !u!114 &5223356675483903234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4396471659944688024}
m_GameObject: {fileID: 3923347955883958669}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@ -1196,7 +1196,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 0648f1198938fcb47a7c627fe1cda06c, type: 3}
m_Sprite: {fileID: 21300000, guid: 477ecd3af8f109449a1c3a27c5e8d047, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1712,7 +1712,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -1729,10 +1729,10 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 200
m_Text:
--- !u!1 &7171890179328870863
GameObject:
m_ObjectHideFlags: 0
@ -1808,6 +1808,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7272950410379939523
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8024944888678983175}
- component: {fileID: 2746401370097365800}
- component: {fileID: 2749957844420998858}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8024944888678983175
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7272950410379939523}
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: 6749790826617255168}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 144, y: 144}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2746401370097365800
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7272950410379939523}
m_CullTransparentMesh: 0
--- !u!114 &2749957844420998858
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7272950410379939523}
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: 0648f1198938fcb47a7c627fe1cda06c, 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 &7317210137545532877
GameObject:
m_ObjectHideFlags: 0
@ -1883,81 +1957,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7413701644791228810
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6539290600892711698}
- component: {fileID: 6143488018226950166}
- component: {fileID: 5441246904139264267}
m_Layer: 5
m_Name: choosed
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6539290600892711698
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7413701644791228810}
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: 3912465624479060842}
m_Father: {fileID: 4227166638646970797}
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.1, y: -0.43}
m_SizeDelta: {x: 142.38, y: 143.14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6143488018226950166
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7413701644791228810}
m_CullTransparentMesh: 0
--- !u!114 &5441246904139264267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7413701644791228810}
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: 477ecd3af8f109449a1c3a27c5e8d047, 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 &7416524560338028249
GameObject:
m_ObjectHideFlags: 0
@ -2279,6 +2278,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6749790826617255168}
- {fileID: 4227166638646970797}
- {fileID: 2066454705874325479}
m_Father: {fileID: 7555683376229264185}

View File

@ -46,7 +46,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -11, y: -325.26}
m_AnchoredPosition: {x: -11, y: -295.89}
m_SizeDelta: {x: 654.7, y: 662.48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &239746164824752273
@ -318,6 +318,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &460767104770519847
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7791062060570277439}
- component: {fileID: 7988475316410012686}
- component: {fileID: 3232785111815574212}
m_Layer: 5
m_Name: remainTimes
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7791062060570277439
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 460767104770519847}
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: 7105179177489773337}
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: -11, y: -652}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7988475316410012686
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 460767104770519847}
m_CullTransparentMesh: 0
--- !u!114 &3232785111815574212
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 460767104770519847}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8196079, g: 0.7294118, b: 0.4666667, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A6"
--- !u!1 &520034509006362329
GameObject:
m_ObjectHideFlags: 0
@ -866,6 +945,8 @@ RectTransform:
- {fileID: 284488866451528290}
- {fileID: 3966214230936824452}
- {fileID: 4107591401879039839}
- {fileID: 7791062060570277439}
- {fileID: 895459858820925187}
m_Father: {fileID: 559604980634051669}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4357,6 +4438,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7217988487555737252
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 895459858820925187}
- component: {fileID: 8404294167446683250}
- component: {fileID: 1188763298742158456}
m_Layer: 5
m_Name: remainTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &895459858820925187
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7217988487555737252}
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: 7105179177489773337}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 314.4, y: 484.24}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8404294167446683250
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7217988487555737252}
m_CullTransparentMesh: 0
--- !u!114 &1188763298742158456
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7217988487555737252}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8196079, g: 0.7294118, b: 0.4666667, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A11\uFF1A11\uFF1A10"
--- !u!1 &7239280344581107916
GameObject:
m_ObjectHideFlags: 0
@ -5010,7 +5170,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -325.26}
m_AnchoredPosition: {x: 0, y: -295.89}
m_SizeDelta: {x: 255, y: 257}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7660136290251236410

View File

@ -578,6 +578,7 @@ JOURNEYMONSTERINFO_ATTACKNUM_FIELD = protobuf.FieldDescriptor();
JOURNEYMONSTERINFO_REWARDSHOW_FIELD = protobuf.FieldDescriptor();
JOURNEYGOODSINFO = protobuf.Descriptor();
JOURNEYGOODSINFO_GOODSID_FIELD = protobuf.FieldDescriptor();
JOURNEYGOODSINFO_GOODSINDEX_FIELD = protobuf.FieldDescriptor();
JOURNEYGOODSINFO_REMAINTIME_FIELD = protobuf.FieldDescriptor();
JOURNEYCELL = protobuf.Descriptor();
JOURNEYCELL_CELLID_FIELD = protobuf.FieldDescriptor();
@ -6000,8 +6001,8 @@ JOURNEYMONSTERINFO_MONSTERHP_FIELD.index = 2
JOURNEYMONSTERINFO_MONSTERHP_FIELD.label = 1
JOURNEYMONSTERINFO_MONSTERHP_FIELD.has_default_value = false
JOURNEYMONSTERINFO_MONSTERHP_FIELD.default_value = 0
JOURNEYMONSTERINFO_MONSTERHP_FIELD.type = 5
JOURNEYMONSTERINFO_MONSTERHP_FIELD.cpp_type = 1
JOURNEYMONSTERINFO_MONSTERHP_FIELD.type = 3
JOURNEYMONSTERINFO_MONSTERHP_FIELD.cpp_type = 2
JOURNEYMONSTERINFO_REMAINTIME_FIELD.name = "remainTime"
JOURNEYMONSTERINFO_REMAINTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyMonsterInfo.remainTime"
@ -6050,10 +6051,20 @@ JOURNEYGOODSINFO_GOODSID_FIELD.default_value = 0
JOURNEYGOODSINFO_GOODSID_FIELD.type = 5
JOURNEYGOODSINFO_GOODSID_FIELD.cpp_type = 1
JOURNEYGOODSINFO_GOODSINDEX_FIELD.name = "goodsIndex"
JOURNEYGOODSINFO_GOODSINDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyGoodsInfo.goodsIndex"
JOURNEYGOODSINFO_GOODSINDEX_FIELD.number = 2
JOURNEYGOODSINFO_GOODSINDEX_FIELD.index = 1
JOURNEYGOODSINFO_GOODSINDEX_FIELD.label = 1
JOURNEYGOODSINFO_GOODSINDEX_FIELD.has_default_value = false
JOURNEYGOODSINFO_GOODSINDEX_FIELD.default_value = 0
JOURNEYGOODSINFO_GOODSINDEX_FIELD.type = 5
JOURNEYGOODSINFO_GOODSINDEX_FIELD.cpp_type = 1
JOURNEYGOODSINFO_REMAINTIME_FIELD.name = "remainTime"
JOURNEYGOODSINFO_REMAINTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyGoodsInfo.remainTime"
JOURNEYGOODSINFO_REMAINTIME_FIELD.number = 2
JOURNEYGOODSINFO_REMAINTIME_FIELD.index = 1
JOURNEYGOODSINFO_REMAINTIME_FIELD.number = 3
JOURNEYGOODSINFO_REMAINTIME_FIELD.index = 2
JOURNEYGOODSINFO_REMAINTIME_FIELD.label = 1
JOURNEYGOODSINFO_REMAINTIME_FIELD.has_default_value = false
JOURNEYGOODSINFO_REMAINTIME_FIELD.default_value = 0
@ -6064,7 +6075,7 @@ JOURNEYGOODSINFO.name = "JourneyGoodsInfo"
JOURNEYGOODSINFO.full_name = ".com.ljsd.jieling.protocols.JourneyGoodsInfo"
JOURNEYGOODSINFO.nested_types = {}
JOURNEYGOODSINFO.enum_types = {}
JOURNEYGOODSINFO.fields = {JOURNEYGOODSINFO_GOODSID_FIELD, JOURNEYGOODSINFO_REMAINTIME_FIELD}
JOURNEYGOODSINFO.fields = {JOURNEYGOODSINFO_GOODSID_FIELD, JOURNEYGOODSINFO_GOODSINDEX_FIELD, JOURNEYGOODSINFO_REMAINTIME_FIELD}
JOURNEYGOODSINFO.is_extendable = false
JOURNEYGOODSINFO.extensions = {}
JOURNEYCELL_CELLID_FIELD.name = "cellId"

View File

@ -200,6 +200,8 @@ JOURNEYGETONEINFORESPONSE_RANDOMTIME_FIELD = protobuf.FieldDescriptor();
JOURNEYGETONEINFORESPONSE_RANDOMNUM_FIELD = protobuf.FieldDescriptor();
JOURNEYGETONEINFORESPONSE_MONSTERINFO_FIELD = protobuf.FieldDescriptor();
JOURNEYGETONEINFORESPONSE_GOODSINFO_FIELD = protobuf.FieldDescriptor();
JOURNEYDOREQUEST = protobuf.Descriptor();
JOURNEYDOREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
JOURNEYDORESPONSE = protobuf.Descriptor();
JOURNEYDORESPONSE_POINTES_FIELD = protobuf.FieldDescriptor();
JOURNEYDORESPONSE_PATHTYPE_FIELD = protobuf.FieldDescriptor();
@ -208,13 +210,23 @@ JOURNEYDORESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
JOURNEYDORESPONSE_MONSTER_FIELD = protobuf.FieldDescriptor();
JOURNEYDORESPONSE_RANDOM_FIELD = protobuf.FieldDescriptor();
JOURNEYDORESPONSE_OVERTIME_FIELD = protobuf.FieldDescriptor();
JOURNEYFIGHTREQUEST = protobuf.Descriptor();
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD = protobuf.FieldDescriptor();
JOURNEYFIGHTREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
JOURNEYFIGHTRESPONSE = protobuf.Descriptor();
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
JOURNEYFIGHTRESPONSE_MONSTER_FIELD = protobuf.FieldDescriptor();
JOURNEYRANDOMREQUEST = protobuf.Descriptor();
JOURNEYRANDOMREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
JOURNEYRANDOMRESPONSE = protobuf.Descriptor();
JOURNEYRANDOMRESPONSE_LOCATION_FIELD = protobuf.FieldDescriptor();
JOURNEYRANDOMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
JOURNEYRANDOMRESPONSE_NEXTRANDOM_FIELD = protobuf.FieldDescriptor();
JOURNEYRANDOMRESPONSE_COUNT_FIELD = protobuf.FieldDescriptor();
JOURNEYFIGHTREQUEST = protobuf.Descriptor();
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD = protobuf.FieldDescriptor();
JOURNEYBUYREQUEST = protobuf.Descriptor();
JOURNEYBUYREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
JOURNEYBUYRESPONSE = protobuf.Descriptor();
JOURNEYBUYRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
HEROINFO_HEROID_FIELD.name = "heroId"
HEROINFO_HEROID_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroInfo.heroId"
@ -2058,6 +2070,23 @@ JOURNEYGETONEINFORESPONSE.enum_types = {}
JOURNEYGETONEINFORESPONSE.fields = {JOURNEYGETONEINFORESPONSE_CELL_FIELD, JOURNEYGETONEINFORESPONSE_LOCATION_FIELD, JOURNEYGETONEINFORESPONSE_DICENUM_FIELD, JOURNEYGETONEINFORESPONSE_RANDOMITEM_FIELD, JOURNEYGETONEINFORESPONSE_RANDOMTIME_FIELD, JOURNEYGETONEINFORESPONSE_RANDOMNUM_FIELD, JOURNEYGETONEINFORESPONSE_MONSTERINFO_FIELD, JOURNEYGETONEINFORESPONSE_GOODSINFO_FIELD}
JOURNEYGETONEINFORESPONSE.is_extendable = false
JOURNEYGETONEINFORESPONSE.extensions = {}
JOURNEYDOREQUEST_MAPID_FIELD.name = "mapId"
JOURNEYDOREQUEST_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyDoRequest.mapId"
JOURNEYDOREQUEST_MAPID_FIELD.number = 1
JOURNEYDOREQUEST_MAPID_FIELD.index = 0
JOURNEYDOREQUEST_MAPID_FIELD.label = 1
JOURNEYDOREQUEST_MAPID_FIELD.has_default_value = false
JOURNEYDOREQUEST_MAPID_FIELD.default_value = 0
JOURNEYDOREQUEST_MAPID_FIELD.type = 5
JOURNEYDOREQUEST_MAPID_FIELD.cpp_type = 1
JOURNEYDOREQUEST.name = "JourneyDoRequest"
JOURNEYDOREQUEST.full_name = ".com.ljsd.jieling.protocols.JourneyDoRequest"
JOURNEYDOREQUEST.nested_types = {}
JOURNEYDOREQUEST.enum_types = {}
JOURNEYDOREQUEST.fields = {JOURNEYDOREQUEST_MAPID_FIELD}
JOURNEYDOREQUEST.is_extendable = false
JOURNEYDOREQUEST.extensions = {}
JOURNEYDORESPONSE_POINTES_FIELD.name = "pointes"
JOURNEYDORESPONSE_POINTES_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyDoResponse.pointes"
JOURNEYDORESPONSE_POINTES_FIELD.number = 1
@ -2137,6 +2166,79 @@ JOURNEYDORESPONSE.enum_types = {}
JOURNEYDORESPONSE.fields = {JOURNEYDORESPONSE_POINTES_FIELD, JOURNEYDORESPONSE_PATHTYPE_FIELD, JOURNEYDORESPONSE_MULTIVALUE_FIELD, JOURNEYDORESPONSE_DROP_FIELD, JOURNEYDORESPONSE_MONSTER_FIELD, JOURNEYDORESPONSE_RANDOM_FIELD, JOURNEYDORESPONSE_OVERTIME_FIELD}
JOURNEYDORESPONSE.is_extendable = false
JOURNEYDORESPONSE.extensions = {}
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.name = "monsterIndex"
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyFightRequest.monsterIndex"
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.number = 1
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.index = 0
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.label = 1
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.has_default_value = false
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.default_value = 0
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.type = 5
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.cpp_type = 1
JOURNEYFIGHTREQUEST_MAPID_FIELD.name = "mapId"
JOURNEYFIGHTREQUEST_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyFightRequest.mapId"
JOURNEYFIGHTREQUEST_MAPID_FIELD.number = 2
JOURNEYFIGHTREQUEST_MAPID_FIELD.index = 1
JOURNEYFIGHTREQUEST_MAPID_FIELD.label = 1
JOURNEYFIGHTREQUEST_MAPID_FIELD.has_default_value = false
JOURNEYFIGHTREQUEST_MAPID_FIELD.default_value = 0
JOURNEYFIGHTREQUEST_MAPID_FIELD.type = 5
JOURNEYFIGHTREQUEST_MAPID_FIELD.cpp_type = 1
JOURNEYFIGHTREQUEST.name = "JourneyFightRequest"
JOURNEYFIGHTREQUEST.full_name = ".com.ljsd.jieling.protocols.JourneyFightRequest"
JOURNEYFIGHTREQUEST.nested_types = {}
JOURNEYFIGHTREQUEST.enum_types = {}
JOURNEYFIGHTREQUEST.fields = {JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD, JOURNEYFIGHTREQUEST_MAPID_FIELD}
JOURNEYFIGHTREQUEST.is_extendable = false
JOURNEYFIGHTREQUEST.extensions = {}
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.name = "fightData"
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyFightResponse.fightData"
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.number = 1
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.index = 0
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.label = 1
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.has_default_value = false
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.default_value = nil
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.message_type = CommonProto_pb.FIGHTDATA
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.type = 11
JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD.cpp_type = 10
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.name = "monster"
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyFightResponse.monster"
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.number = 2
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.index = 1
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.label = 1
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.has_default_value = false
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.default_value = nil
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.message_type = CommonProto_pb.JOURNEYMONSTERINFO
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.type = 11
JOURNEYFIGHTRESPONSE_MONSTER_FIELD.cpp_type = 10
JOURNEYFIGHTRESPONSE.name = "JourneyFightResponse"
JOURNEYFIGHTRESPONSE.full_name = ".com.ljsd.jieling.protocols.JourneyFightResponse"
JOURNEYFIGHTRESPONSE.nested_types = {}
JOURNEYFIGHTRESPONSE.enum_types = {}
JOURNEYFIGHTRESPONSE.fields = {JOURNEYFIGHTRESPONSE_FIGHTDATA_FIELD, JOURNEYFIGHTRESPONSE_MONSTER_FIELD}
JOURNEYFIGHTRESPONSE.is_extendable = false
JOURNEYFIGHTRESPONSE.extensions = {}
JOURNEYRANDOMREQUEST_MAPID_FIELD.name = "mapId"
JOURNEYRANDOMREQUEST_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyRandomRequest.mapId"
JOURNEYRANDOMREQUEST_MAPID_FIELD.number = 1
JOURNEYRANDOMREQUEST_MAPID_FIELD.index = 0
JOURNEYRANDOMREQUEST_MAPID_FIELD.label = 1
JOURNEYRANDOMREQUEST_MAPID_FIELD.has_default_value = false
JOURNEYRANDOMREQUEST_MAPID_FIELD.default_value = 0
JOURNEYRANDOMREQUEST_MAPID_FIELD.type = 5
JOURNEYRANDOMREQUEST_MAPID_FIELD.cpp_type = 1
JOURNEYRANDOMREQUEST.name = "JourneyRandomRequest"
JOURNEYRANDOMREQUEST.full_name = ".com.ljsd.jieling.protocols.JourneyRandomRequest"
JOURNEYRANDOMREQUEST.nested_types = {}
JOURNEYRANDOMREQUEST.enum_types = {}
JOURNEYRANDOMREQUEST.fields = {JOURNEYRANDOMREQUEST_MAPID_FIELD}
JOURNEYRANDOMREQUEST.is_extendable = false
JOURNEYRANDOMREQUEST.extensions = {}
JOURNEYRANDOMRESPONSE_LOCATION_FIELD.name = "location"
JOURNEYRANDOMRESPONSE_LOCATION_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyRandomResponse.location"
JOURNEYRANDOMRESPONSE_LOCATION_FIELD.number = 1
@ -2185,23 +2287,41 @@ JOURNEYRANDOMRESPONSE.enum_types = {}
JOURNEYRANDOMRESPONSE.fields = {JOURNEYRANDOMRESPONSE_LOCATION_FIELD, JOURNEYRANDOMRESPONSE_DROP_FIELD, JOURNEYRANDOMRESPONSE_NEXTRANDOM_FIELD, JOURNEYRANDOMRESPONSE_COUNT_FIELD}
JOURNEYRANDOMRESPONSE.is_extendable = false
JOURNEYRANDOMRESPONSE.extensions = {}
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.name = "monsterIndex"
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyFightRequest.monsterIndex"
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.number = 3
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.index = 0
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.label = 1
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.has_default_value = false
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.default_value = 0
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.type = 5
JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD.cpp_type = 1
JOURNEYBUYREQUEST_MAPID_FIELD.name = "mapId"
JOURNEYBUYREQUEST_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyBuyRequest.mapId"
JOURNEYBUYREQUEST_MAPID_FIELD.number = 1
JOURNEYBUYREQUEST_MAPID_FIELD.index = 0
JOURNEYBUYREQUEST_MAPID_FIELD.label = 1
JOURNEYBUYREQUEST_MAPID_FIELD.has_default_value = false
JOURNEYBUYREQUEST_MAPID_FIELD.default_value = 0
JOURNEYBUYREQUEST_MAPID_FIELD.type = 5
JOURNEYBUYREQUEST_MAPID_FIELD.cpp_type = 1
JOURNEYFIGHTREQUEST.name = "JourneyFightRequest"
JOURNEYFIGHTREQUEST.full_name = ".com.ljsd.jieling.protocols.JourneyFightRequest"
JOURNEYFIGHTREQUEST.nested_types = {}
JOURNEYFIGHTREQUEST.enum_types = {}
JOURNEYFIGHTREQUEST.fields = {JOURNEYFIGHTREQUEST_MONSTERINDEX_FIELD}
JOURNEYFIGHTREQUEST.is_extendable = false
JOURNEYFIGHTREQUEST.extensions = {}
JOURNEYBUYREQUEST.name = "JourneyBuyRequest"
JOURNEYBUYREQUEST.full_name = ".com.ljsd.jieling.protocols.JourneyBuyRequest"
JOURNEYBUYREQUEST.nested_types = {}
JOURNEYBUYREQUEST.enum_types = {}
JOURNEYBUYREQUEST.fields = {JOURNEYBUYREQUEST_MAPID_FIELD}
JOURNEYBUYREQUEST.is_extendable = false
JOURNEYBUYREQUEST.extensions = {}
JOURNEYBUYRESPONSE_DROP_FIELD.name = "drop"
JOURNEYBUYRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.JourneyBuyResponse.drop"
JOURNEYBUYRESPONSE_DROP_FIELD.number = 1
JOURNEYBUYRESPONSE_DROP_FIELD.index = 0
JOURNEYBUYRESPONSE_DROP_FIELD.label = 1
JOURNEYBUYRESPONSE_DROP_FIELD.has_default_value = false
JOURNEYBUYRESPONSE_DROP_FIELD.default_value = nil
JOURNEYBUYRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
JOURNEYBUYRESPONSE_DROP_FIELD.type = 11
JOURNEYBUYRESPONSE_DROP_FIELD.cpp_type = 10
JOURNEYBUYRESPONSE.name = "JourneyBuyResponse"
JOURNEYBUYRESPONSE.full_name = ".com.ljsd.jieling.protocols.JourneyBuyResponse"
JOURNEYBUYRESPONSE.nested_types = {}
JOURNEYBUYRESPONSE.enum_types = {}
JOURNEYBUYRESPONSE.fields = {JOURNEYBUYRESPONSE_DROP_FIELD}
JOURNEYBUYRESPONSE.is_extendable = false
JOURNEYBUYRESPONSE.extensions = {}
DifficultMapOption = protobuf.Message(DIFFICULTMAPOPTION)
DifficultMapRequest = protobuf.Message(DIFFICULTMAPREQUEST)
@ -2220,11 +2340,16 @@ GetEndlessHeroResponse = protobuf.Message(GETENDLESSHERORESPONSE)
GetTrialBoxRewardRequest = protobuf.Message(GETTRIALBOXREWARDREQUEST)
GetTrialBoxRewardResponse = protobuf.Message(GETTRIALBOXREWARDRESPONSE)
HeroInfo = protobuf.Message(HEROINFO)
JourneyBuyRequest = protobuf.Message(JOURNEYBUYREQUEST)
JourneyBuyResponse = protobuf.Message(JOURNEYBUYRESPONSE)
JourneyDoRequest = protobuf.Message(JOURNEYDOREQUEST)
JourneyDoResponse = protobuf.Message(JOURNEYDORESPONSE)
JourneyFightRequest = protobuf.Message(JOURNEYFIGHTREQUEST)
JourneyFightResponse = protobuf.Message(JOURNEYFIGHTRESPONSE)
JourneyGetInfoResponse = protobuf.Message(JOURNEYGETINFORESPONSE)
JourneyGetOneInfoRequest = protobuf.Message(JOURNEYGETONEINFOREQUEST)
JourneyGetOneInfoResponse = protobuf.Message(JOURNEYGETONEINFORESPONSE)
JourneyRandomRequest = protobuf.Message(JOURNEYRANDOMREQUEST)
JourneyRandomResponse = protobuf.Message(JOURNEYRANDOMRESPONSE)
MapBuyFightCountRequest = protobuf.Message(MAPBUYFIGHTCOUNTREQUEST)
MapEnterRequest = protobuf.Message(MAPENTERREQUEST)

File diff suppressed because one or more lines are too long

View File

@ -129,7 +129,9 @@ function GMPanel:InitComponent()
this.btnJump = Util.GetGameObject(self.gameObject, "jump/Button")
this.jumpId = Util.GetGameObject(self.gameObject, "jump/InputField/Text"):GetComponent("Text")
-- 跳转测试
this.xiaoyaoyou = Util.GetGameObject(self.gameObject, "xiaoyaoyou/Button")
this.xiaoyaoyouText = Util.GetGameObject(self.gameObject, "xiaoyaoyou/InputField/Text"):GetComponent("Text")
-- 添加圣物
this.btnAddHoly = Util.GetGameObject(self.gameObject, "HolyItem/Button")
this.HolyId = Util.GetGameObject(self.gameObject, "HolyItem/InputField/Text"):GetComponent("Text")
@ -361,6 +363,12 @@ function GMPanel:BindEvent()
Util.AddClick(this.btnJump, function()
JumpManager.GoJump(tonumber(this.jumpId.text))
end)
--逍遥游
Util.AddClick(this.xiaoyaoyou, function()
Log("gm逍遥游"..this.xiaoyaoyouText.text)
NetManager.GMEvent(this.xiaoyaoyouText.text)
end)
--增加圣物
Util.AddClick(this.btnAddHoly, function()

View File

@ -4516,17 +4516,18 @@ function this.JourneyDoResponse(func)
end)
end
function this.StartXiaoyaoBossFightRequest(index)
function this.StartXiaoyaoBossFightRequest(index,func)
local data = MapInfoProto_pb.JourneyFightRequest()
data.monsterIndex = index
data.mapId = XiaoYaoManager.curMapId
local msg = data:SerializeToString()
-- Network:SendMessageWithCallBack(MessageTypeProto_pb.JOURNEY_DO_REQUEST, MessageTypeProto_pb.JOURNEY_DO_RESPONSE, msg, function(buffer)
-- local data = buffer:DataByte()
-- local msg = MapInfoProto_pb.JourneyGetInfoResponse()
-- msg:ParseFromString(data)
-- if func then
-- func(msg)
-- end
-- end)
Network:SendMessageWithCallBack(MessageTypeProto_pb.JourneyFightRequest, MessageTypeProto_pb.JourneyFightResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.JourneyFightResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -9,6 +9,7 @@ local _LiveNode
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local rewardGroupConfig=ConfigManager.GetConfig(ConfigName.RewardGroup)
local MonsterConfig=ConfigManager.GetConfig(ConfigName.MonsterConfig)
local ArtConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
@ -16,6 +17,7 @@ local monsterGroupPrefabs = {}
local rewardPrefabs = {}
local costId = 0
local costNum = 0
local cost = {}
local fightBossIndex = 0
function XiaoYaoLuckyBossPopup:InitComponent()
@ -34,6 +36,7 @@ function XiaoYaoLuckyBossPopup:InitComponent()
this.iconPre=Util.GetGameObject(this.root,"Panel/EnemyInfo/Scroll/pre")
this.timeText = Util.GetGameObject(this.root,"Panel/EnemyInfo/remainTime"):GetComponent("Text")
this.selectKuang = Util.GetGameObject(this.root,"Panel/EnemyInfo/Scroll/choosed")
end
function XiaoYaoLuckyBossPopup:BindEvent()
@ -45,10 +48,7 @@ function XiaoYaoLuckyBossPopup:BindEvent()
if BagManager.GetItemCountById(costId) < costNum then
PopupTipPanel.ShowTip("消耗道具不足")
else
XiaoYaoManager.ExecuteFightBattle(curMonsterGroup.monsterIndex,function()
fightBossIndex = curMonsterGroup.monsterIndex
this:OnShow()
end)
XiaoYaoManager.ExecuteFightBattle(curMonsterGroup.monsterIndex)
end
end)
end
@ -56,12 +56,15 @@ end
function XiaoYaoLuckyBossPopup:OnOpen()
local config = ConfigManager.GetConfigDataByKey(ConfigName.FreeTravel,"MapID",XiaoYaoManager.curMapId)
costId = config.BossConsume[1]
costNum = config.BossConsume[2]
cost = config.BossConsume
end
function XiaoYaoLuckyBossPopup:OnShow()
monsterGroup = XiaoYaoManager.GetMonsterDatas()
if not monsterGroup or #monsterGroup < 1 then
this:ClosePanel()
end
fightBossIndex = XiaoYaoManager.fightBossIndex
if fightBossIndex == 0 then
curMonsterGroup = monsterGroup[1]
else
@ -88,13 +91,22 @@ function this:TimerDown()
this.timer:Stop()
this.timer = nil
end
local timeDown = curMonsterGroup.remainTime
local timeDown = curMonsterGroup.remainTime - PlayerManager.serverTime()
local temp = 0
this.timeText.text = "剩余时间:"..TimeToHMS(timeDown)
this.timer = Timer.New(function()
if timeDown < 1 then
this:OnShow()
XiaoYaoManager.fightBossIndex = 0
this:OnShow()
return
end
for i = 1 , #monsterGroup do
temp = monsterGroup[i].remainTime - PlayerManager.serverTime()
if temp < 1 then
this:OnShow()
return
end
end
timeDown = timeDown - 1
this.timeText.text = "剩余时间:"..TimeToHMS(timeDown)
end, 1, -1, true)
@ -104,7 +116,7 @@ function this:InitMonsterList()
for i = 1 ,#monsterGroupPrefabs do
monsterGroupPrefabs[i].gameObject:SetActive(false)
end
for i = 1 , monsterGroup do
for i = 1 , #monsterGroup do
if not monsterGroupPrefabs[i] then
monsterGroupPrefabs[i] = newObjToParent(this.iconPre,this.heroList)
end
@ -123,20 +135,23 @@ function XiaoYaoLuckyBossPopup:SetSingleMonster(go,data)
icon.sprite = Util.LoadSprite(GetResourcePath(heroConfig[_data.MonsterId].Icon))
lv.text = _data.Level
if data.monsterIndex == curMonsterGroup.monsterIndex then
Util.GetGameObject(go,"choosed"):SetActive(true)
else
Util.GetGameObject(go,"choosed"):SetActive(false)
this.selectKuang:setParent(go.transform)
this.selectKuang:GetComponent("RectTransform").localPosition = Vector3.zero
end
Util.AddOnceClick(go,function()
if curMonsterGroup.monsterId == data.monsterId then
else
curMonsterGroup = data
this.selectKuang:setParent(go.transform)
this.selectKuang:GetComponent("RectTransform").localPosition = Vector3.zero
poolManager:UnLoadLive(_LiveName, _LiveNode)
this:SetSelectHero(data)
end
end)
end
function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData)
XiaoYaoManager.fightBossIndex = monsterData.monsterIndex
local _data = MonsterConfig[monsterData.monsterId]
local monsterId = _data.MonsterId
local paintingId = heroConfig[monsterId].Live
@ -146,29 +161,59 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData)
_LiveNode = poolManager:LoadLive(_LiveName, this.e_liveRoot.transform, Vector3.one * heroConfig[monsterId].Scale*0.7, Vector3.New(pos[1], pos[2], 0))
this.e_level.text = "lv.".. _data.Level
this.e_name.text = _data.ReadingName
this.hp.fillAmount = monsterData.monsterHp/_data.Hp
this.hp.fillAmount = math.floor(monsterData.monsterHp/_data.Hp/100).."%"
if monsterData.attackNum > 0 then
Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(false)
Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(true)
Util.GetGameObject(this.e_fightBtn,"layout/icon"):GetComponent("Image").sprite = Util.LoadSprite(ArtConfig[costId].Name)
if not cost[monsterData.attackNum] then
costId = cost[#cost][1]
costNum = cost[#cost][2]
else
costId = cost[monsterData.attackNum][1]
costNum = cost[monsterData.attackNum][2]
end
if BagManager.GetItemCountById(costId) < costNum then
Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "<color=#FF0000>" .. costNum .. "</color>"
else
Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "<color=#FFFFFF>" .. costNum .. "</color>"
end
else
Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(true)
Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(false)
end
this:SetSingleReward(monsterData.reward)
end
function XiaoYaoLuckyBossPopup:SetSelectKuang()
for i = 1 ,#monsterGroupPrefabs do
Util.GetGameObject(monsterGroupPrefabs[i],"choosed"):SetActive(true)
function XiaoYaoLuckyBossPopup:SetSingleReward(id)
for i = 1 ,#rewardPrefabs do
rewardPrefabs[i].gameObject:SetActive(false)
end
local data = rewardGroupConfig[id].ShowItem
for i = 1 , #data do
if not rewardPrefabs[i] then
rewardPrefabs[i] = SubUIManager.Open(SubUIConfig.ItemView,this.rewardList)
end
rewardPrefabs[i].gameObject:SetActive(true)
rewardPrefabs[i]:OnOpen(false, {data[i][1],data[i][2]},0.8,false,false,false)
end
end
function this:OnClose()
poolManager:UnLoadLive(_LiveName, this.e_liveRoot.transform)
_LiveName = ""
_LiveNode = nil
if this.Timer then
this.timer:Stop()
this.timer = nil
end
end
function this:OnClose()
end
function this:OnDestroy()
_LiveName = {}
_LiveNode = {}
poolManager:UnLoadLive(_LiveName, this.e_liveRoot.transform)
_LiveName = ""
_LiveNode = nil
if this.Timer then
this.timer:Stop()
this.timer = nil
end
end
return this

View File

@ -12,8 +12,8 @@ local isActive = true
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local atrConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local id
local num
local id = 0
local num = 0
function XiaoYaoLuckyTurnTablePopup:InitComponent()
this.titleText = Util.GetGameObject(self.transform, "Panel/bg/titleText"):GetComponent("Text")
this.closeBtn = Util.GetGameObject(self.transform, "Panel/bg/closeBtn"):GetComponent("Button")
@ -21,6 +21,8 @@ function XiaoYaoLuckyTurnTablePopup:InitComponent()
this.itemsLayout = Util.GetGameObject(self.transform, "Panel/items")
this.btn = Util.GetGameObject(self.transform, "start")
this.remainTimes = Util.GetGameObject(self.transform, "Panel/remainTimes"):GetComponent("Text")
this.remainTime = Util.GetGameObject(self.transform, "Panel/remainTime"):GetComponent("Text")
for i = 1, this.itemsLayout.transform.childCount do
_itemsList[i] = this.itemsLayout.transform:GetChild(i - 1)
end
@ -53,12 +55,14 @@ end
--界面打开时调用(用于子类重写)
function XiaoYaoLuckyTurnTablePopup:OnOpen(...)
this.titleText = "幸运转盘"
end
function XiaoYaoLuckyTurnTablePopup:OnShow()
this.remainTimes = "剩余次数:"..XiaoYaoManager.luckyluckyTurnTableTimes
this:TimerDown()
local red = Util.GetGameObject(this.itemsList[1],"Red")
red:SetActive(true)
for index, item in pairs(this.itemsList) do
local reward = Util.GetGameObject(item,"reward"):GetComponent("Image")
local Name = ""--this.ArtConfig[this.ItemConfig[this.TrialGameConfig[this.list[index]].RewardID].ResourceID].Name--Index->奖励id->itemID->资源名字)
@ -135,6 +139,23 @@ function XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId)
this.turnEffect:Start()
end
end
function this:TimerDown()
if this.Timer then
this.timer:Stop()
this.timer = nil
end
local timeDown = XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime()
this.remainTime.text = "剩余时间:"..TimeToHMS(timeDown)
this.timer = Timer.New(function()
if timeDown < 1 then
this:ClosePanel()
return
end
timeDown = timeDown - 1
this.remainTime.text = "剩余时间:"..TimeToHMS(timeDown)
end, 1, -1, true)
self.timer:Start()
end
function XiaoYaoLuckyTurnTablePopup:OnClose()
for index, value in ipairs(this.itemsList) do
local red = Util.GetGameObject(this.itemsList[index],"Red")
@ -149,9 +170,17 @@ function XiaoYaoLuckyTurnTablePopup:OnClose()
this.turnEffect:Stop()
this.turnEffect = nil
end
if this.Timer then
this.timer:Stop()
this.timer = nil
end
end
function XiaoYaoLuckyTurnTablePopup:OnDestroy()
if this.Timer then
this.timer:Stop()
this.timer = nil
end
end
return this

View File

@ -4,6 +4,7 @@ this.curMapId=0;
this.curMapData={}
this.MonsterData={}
this.fightBossIndex = 0
this.luckyTurnTableRewards={}
this.luckyluckyTurnTableTimes = 0
@ -34,9 +35,10 @@ function this.OpenXiaoYaoMap(mapId)
table.sort(this.curMapData.cell,function(a,b)
return a.cellIndex < b.cellIndex
end)
end
-- this.InitLuckyTurnTables(msg)
-- this.InitMonsterData(msg.monsterInfo,1)
end
this.fightBossIndex = 0
this.InitLuckyTurnTables(msg)
this.InitMonsterData(msg.monsterInfo,1)
Log("打开逍遥游地图列表界面")
UIManager.OpenPanel(UIName.XiaoYaoMapPanel)
end)
@ -51,15 +53,14 @@ function this.StartXiaoYao()
end
--0、普通节点 1、奖励节点 2、双倍节点 3、额外骰子节点 4、招募英雄节点 5、怪物节点 6,转盘
if msg.pathType == 5 then
this.InitMonsterData(msg.monsterInfo,2)
this.InitMonsterData(msg.monster,2)
elseif msg.pathType == 6 then
this.InitLuckyTurnTables(msg)
end
Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.StartXiaoYao, msg)
end)
end
--初始化幸运转盘
function this.InitLuckyTurnTables(msg)
this.luckyTurnTableRewards = {}
for i = 1, #msg.randomItem do
@ -73,23 +74,43 @@ function this.InitLuckyTurnTables(msg)
end
end
-- type 1初始化 2添加
-- type 1初始化 2添加 boss
function this.InitMonsterData(BackMonsterDatas,type)
if type == 1 then
this.MonsterData = {}
end
for i= 1, #BackMonsterDatas do
for i= 1, #BackMonsterDatas do
local monster = {}
monster.monsterId = BackMonsterDatas[i].monsterId
monster.monsterIndex = BackMonsterDatas[i].monsterIndex
monster.monsterHp = BackMonsterDatas[i].monsterHp
monster.remainTime = BackMonsterDatas[i].remainTime
monster.attackNum = BackMonsterDatas[i].attackNum
monster.reward = BackMonsterDatas[i].rewardShow
table.insert(this.MonsterData,monster)
end
elseif type == 2 then
local monster = {}
monster.monsterId = BackMonsterDatas[i].monsterId
monster.monsterIndex = BackMonsterDatas[i].monsterIndex
monster.monsterHp = BackMonsterDatas[i].monsterHp
monster.remainTime = BackMonsterDatas[i].remainTime
monster.attackNum = BackMonsterDatas[i].attackNum
monster.reward = BackMonsterDatas[i].reward
table.insert(this.MonsterData,monster)
monster.monsterId = BackMonsterDatas.monsterId
monster.monsterIndex = BackMonsterDatas.monsterIndex
monster.monsterHp = BackMonsterDatas.monsterHp
monster.remainTime = BackMonsterDatas.remainTime
monster.attackNum = BackMonsterDatas.attackNum
monster.reward = BackMonsterDatas.rewardShow
table.insert(this.MonsterData,monster)
end
this.SortMonster(this.MonsterData)
end
--刷新
function this.UpdateMonsterData(BackMonsterData,id)
for i= 1, #this.MonsterData do
if not BackMonsterData and this.MonsterData[i].monsterIndex == id then
table.remove(this.MonsterData,i)
elseif BackMonsterData and BackMonsterData.monsterIndex == this.MonsterData[i].monsterIndex then
this.MonsterData[i].monsterHp = BackMonsterData.monsterHp
this.MonsterData[i].attackNum = BackMonsterData.attackNum
end
end
end
function this.GetMonsterDatas()
if not this.MonsterData or #this.MonsterData < 1 then
@ -97,6 +118,9 @@ function this.InitMonsterData(BackMonsterDatas,type)
end
for i = 1 , #this.MonsterData do
if this.MonsterData[i].remainTime - PlayerManager.serverTime() < 1 then
if this.MonsterData[i].monsterIndex == this.fightBossIndex then
this.fightBossIndex = 0
end
table.remove(this.MonsterData,i)
end
end
@ -130,32 +154,17 @@ function this.GetMonsterDataReMainTimesAndTime()
end
--开始战斗
function this.ExecuteFightBattle(id,func)
function this.ExecuteFightBattle(id)
NetManager.StartXiaoyaoBossFightRequest(id,function(msg)
local fightData = BattleManager.GetBattleServerData(msg,0)
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE,function(result)
if func then
func()
end
if result.result == 0 then
if this.levelData[this.curType].state == 1 then
UIManager.OpenPanel(UIName.XuanYuanMirrorPanelList,this.curType)
else
UIManager.OpenPanel(UIName.XuanYuanMirrorPanel)
end
elseif result.result == 1 then
this.levelData[this.curType].passId = id
this.UpdateLevelState(this.curType)
PrivilegeManager.RefreshPrivilegeUsedTimes(XuanYuanMirrorManager.freeTimeId, 1)
CheckRedPointStatus(RedPointType.People_Mirror)
if this.levelData[this.curType].state == 1 then
UIManager.OpenPanel(UIName.XuanYuanMirrorPanelList,this.curType)
else
UIManager.OpenPanel(UIName.XuanYuanMirrorPanel)
end
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
end)
end
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.STORY_FIGHT,function(result)
this.UpdateMonsterData(msg.monster,id)
this.OpenMapList()
UIManager.OpenPanel(UIName.XiaoYaoLuckyBossPopup)
if result.result == 1 then
this.fightBossIndex = 0
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() end)
end
end)
end)
end

View File

@ -25,7 +25,6 @@ function this:BindEvent()
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
self:ClosePanel()
end)
end
--添加事件监听(用于子类重写)