root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【战斗】============自动战斗提交

develop_bt_ob2
wangzhenxing 2023-07-05 16:08:27 +08:00
parent 693094ddd7
commit 4e7bc33d14
12 changed files with 653 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AssetBundles/version.txt
View File

@ -1 +1 @@
{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"}
{"EncyptKey":"", "packageVersion":"0.1", "buglyId":"261348dcd3", "resUrl":"http://10.2.1.12/jieling_dl/dev/assetBundles/mht_china/local/", "channel":"pc", "version":"0.1.22", "subChannel":"1", "serverUrl":"http://154.8.193.157:8080/"}

327
Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
View File

@ -352,6 +352,123 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &320694908
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 320694909}
- component: {fileID: 320694912}
- component: {fileID: 320694911}
- component: {fileID: 320694910}
m_Layer: 5
m_Name: btn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &320694909
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320694908}
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: 1423110971}
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: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &320694912
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320694908}
m_CullTransparentMesh: 0
--- !u!114 &320694911
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320694908}
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: d1e04308c0a66644a804a2800a96d3a2, 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 &320694910
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320694908}
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: 320694911}
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 &325797786
GameObject:
m_ObjectHideFlags: 0
@ -10115,6 +10232,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &746359430
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 746359431}
- component: {fileID: 746359433}
- component: {fileID: 746359432}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &746359431
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746359430}
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: 1423110971}
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: 2.3, y: 11.2}
m_SizeDelta: {x: 74, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &746359433
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746359430}
m_CullTransparentMesh: 0
--- !u!114 &746359432
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746359430}
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: 84b137e960461f44082b1491d6ce5b7b, 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 &762939337
GameObject:
m_ObjectHideFlags: 0
@ -10269,6 +10460,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: '************************************************'
LanguageIndex: 10530
--- !u!1 &815403313
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 815403314}
- component: {fileID: 815403316}
- component: {fileID: 815403315}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &815403314
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 815403313}
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: 1423110971}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 108.8, y: 4.6}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &815403316
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 815403313}
m_CullTransparentMesh: 0
--- !u!114 &815403315
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 815403313}
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.95294124, g: 0.7254902, b: 0.21960786, 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: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u81EA\u52A8\u6218\u6597"
--- !u!1 &921277673
GameObject:
m_ObjectHideFlags: 0
@ -10814,7 +11084,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 159, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747
@ -11104,6 +11374,44 @@ RectTransform:
m_AnchoredPosition: {x: -509.9, y: 359}
m_SizeDelta: {x: 977.6, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1423110970
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1423110971}
m_Layer: 5
m_Name: jumpFight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1423110971
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1423110970}
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: 320694909}
- {fileID: 746359431}
- {fileID: 815403314}
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -204, y: -1355}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1596169475
GameObject:
m_ObjectHideFlags: 0
@ -11139,7 +11447,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 301.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479
@ -139509,7 +139817,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7203306409298755909
@ -146353,6 +146661,7 @@ RectTransform:
- {fileID: 5912275222556601812}
- {fileID: 7203306410379096177}
- {fileID: 3902291279210681603}
- {fileID: 1423110971}
m_Father: {fileID: 3223588515252977199}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -147901,15 +148210,15 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3}
--- !u!1 &1533186584701823329 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}
--- !u!224 &830511510176938944 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1533186584701823329 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
m_PrefabInstance: {fileID: 8971074634032498639}
m_PrefabAsset: {fileID: 0}

3
Assets/ManagedResources/~Lua/Logic/GameEvent.lua
View File

@ -401,7 +401,8 @@ GameEvent = {
OnPrivilegeZeroUpdate = "Privilege.OnPrivilegeZeroUpdate",
},
Battle = {
OnTimeScaleChanged = "Battle.OnTimeScaleChanged"
OnTimeScaleChanged = "Battle.OnTimeScaleChanged",
AutoFightOnceEnd="Battle.OnTimeScaleChanged",
},
MonthCard={
OnMonthCardUpdate = "MonthCard.OnMonthCardUpdate",

63
Assets/ManagedResources/~Lua/Message/FightInfoProto_pb.lua
View File

@ -11,6 +11,12 @@ FIGHTSTARTREQUEST_FIGHTID_FIELD = protobuf.FieldDescriptor();
FIGHTSTARTREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
FIGHTSTARTRESPONSE = protobuf.Descriptor();
FIGHTSTARTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
AUTOFIGHTREQUEST = protobuf.Descriptor();
AUTOFIGHTREQUEST_FIGHTID_FIELD = protobuf.FieldDescriptor();
AUTOFIGHTREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
AUTOFIGHTRESPONSE = protobuf.Descriptor();
AUTOFIGHTRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
AUTOFIGHTRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
FIGHTENDREQUEST = protobuf.Descriptor();
FIGHTENDREQUEST_MONSTERGROUPID_FIELD = protobuf.FieldDescriptor();
FIGHTENDREQUEST_FRAMES_FIELD = protobuf.FieldDescriptor();
@ -218,6 +224,61 @@ FIGHTSTARTRESPONSE.enum_types = {}
FIGHTSTARTRESPONSE.fields = {FIGHTSTARTRESPONSE_FIGHTDATA_FIELD}
FIGHTSTARTRESPONSE.is_extendable = false
FIGHTSTARTRESPONSE.extensions = {}
AUTOFIGHTREQUEST_FIGHTID_FIELD.name = "fightId"
AUTOFIGHTREQUEST_FIGHTID_FIELD.full_name = ".rpc.protocols.AutoFightRequest.fightId"
AUTOFIGHTREQUEST_FIGHTID_FIELD.number = 1
AUTOFIGHTREQUEST_FIGHTID_FIELD.index = 0
AUTOFIGHTREQUEST_FIGHTID_FIELD.label = 1
AUTOFIGHTREQUEST_FIGHTID_FIELD.has_default_value = false
AUTOFIGHTREQUEST_FIGHTID_FIELD.default_value = 0
AUTOFIGHTREQUEST_FIGHTID_FIELD.type = 5
AUTOFIGHTREQUEST_FIGHTID_FIELD.cpp_type = 1
AUTOFIGHTREQUEST_TEAMID_FIELD.name = "teamId"
AUTOFIGHTREQUEST_TEAMID_FIELD.full_name = ".rpc.protocols.AutoFightRequest.teamId"
AUTOFIGHTREQUEST_TEAMID_FIELD.number = 2
AUTOFIGHTREQUEST_TEAMID_FIELD.index = 1
AUTOFIGHTREQUEST_TEAMID_FIELD.label = 1
AUTOFIGHTREQUEST_TEAMID_FIELD.has_default_value = false
AUTOFIGHTREQUEST_TEAMID_FIELD.default_value = 0
AUTOFIGHTREQUEST_TEAMID_FIELD.type = 5
AUTOFIGHTREQUEST_TEAMID_FIELD.cpp_type = 1
AUTOFIGHTREQUEST.name = "AutoFightRequest"
AUTOFIGHTREQUEST.full_name = ".rpc.protocols.AutoFightRequest"
AUTOFIGHTREQUEST.nested_types = {}
AUTOFIGHTREQUEST.enum_types = {}
AUTOFIGHTREQUEST.fields = {AUTOFIGHTREQUEST_FIGHTID_FIELD, AUTOFIGHTREQUEST_TEAMID_FIELD}
AUTOFIGHTREQUEST.is_extendable = false
AUTOFIGHTREQUEST.extensions = {}
AUTOFIGHTRESPONSE_RESULT_FIELD.name = "result"
AUTOFIGHTRESPONSE_RESULT_FIELD.full_name = ".rpc.protocols.AutoFightResponse.result"
AUTOFIGHTRESPONSE_RESULT_FIELD.number = 1
AUTOFIGHTRESPONSE_RESULT_FIELD.index = 0
AUTOFIGHTRESPONSE_RESULT_FIELD.label = 1
AUTOFIGHTRESPONSE_RESULT_FIELD.has_default_value = false
AUTOFIGHTRESPONSE_RESULT_FIELD.default_value = 0
AUTOFIGHTRESPONSE_RESULT_FIELD.type = 5
AUTOFIGHTRESPONSE_RESULT_FIELD.cpp_type = 1
AUTOFIGHTRESPONSE_DROP_FIELD.name = "drop"
AUTOFIGHTRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.AutoFightResponse.drop"
AUTOFIGHTRESPONSE_DROP_FIELD.number = 2
AUTOFIGHTRESPONSE_DROP_FIELD.index = 1
AUTOFIGHTRESPONSE_DROP_FIELD.label = 1
AUTOFIGHTRESPONSE_DROP_FIELD.has_default_value = false
AUTOFIGHTRESPONSE_DROP_FIELD.default_value = nil
AUTOFIGHTRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
AUTOFIGHTRESPONSE_DROP_FIELD.type = 11
AUTOFIGHTRESPONSE_DROP_FIELD.cpp_type = 10
AUTOFIGHTRESPONSE.name = "AutoFightResponse"
AUTOFIGHTRESPONSE.full_name = ".rpc.protocols.AutoFightResponse"
AUTOFIGHTRESPONSE.nested_types = {}
AUTOFIGHTRESPONSE.enum_types = {}
AUTOFIGHTRESPONSE.fields = {AUTOFIGHTRESPONSE_RESULT_FIELD, AUTOFIGHTRESPONSE_DROP_FIELD}
AUTOFIGHTRESPONSE.is_extendable = false
AUTOFIGHTRESPONSE.extensions = {}
FIGHTENDREQUEST_MONSTERGROUPID_FIELD.name = "monsterGroupId"
FIGHTENDREQUEST_MONSTERGROUPID_FIELD.full_name = ".rpc.protocols.FightEndRequest.monsterGroupId"
FIGHTENDREQUEST_MONSTERGROUPID_FIELD.number = 1
@ -1561,6 +1622,8 @@ AdventurnChallengeRequest = protobuf.Message(ADVENTURNCHALLENGEREQUEST)
AdventurnChallengeResponse = protobuf.Message(ADVENTURNCHALLENGERESPONSE)
AdventurnRankRequest = protobuf.Message(ADVENTURNRANKREQUEST)
AdventurnRankResponse = protobuf.Message(ADVENTURNRANKRESPONSE)
AutoFightRequest = protobuf.Message(AUTOFIGHTREQUEST)
AutoFightResponse = protobuf.Message(AUTOFIGHTRESPONSE)
DuoduiChallengeRequest = protobuf.Message(DUODUICHALLENGEREQUEST)
DuoduiChallengeResponse = protobuf.Message(DUODUICHALLENGERESPONSE)
DuoduiInfoRequest = protobuf.Message(DUODUIINFOREQUEST)

120
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
View File

File diff suppressed because one or more lines are too long

87
Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
View File

@ -263,6 +263,9 @@ function FightPointPassMainPanel:InitComponent()
end
--绑定事件（用于子类重写）
function FightPointPassMainPanel:BindEvent()
@ -419,6 +422,7 @@ function FightPointPassMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, this.OnUIOpen)
Game.GlobalEvent:AddEvent(GameEvent.Guide.FuncGuideDone, this.OnFuncGuideDone)
Game.GlobalEvent:AddEvent(GameEvent.Battle.AutoFightOnceEnd, this.WindowOnFocus)
end
--移除事件监听（用于子类重写）
@ -438,8 +442,90 @@ function FightPointPassMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, this.OnUIOpen)
Game.GlobalEvent:RemoveEvent(GameEvent.Guide.FuncGuideDone, this.OnFuncGuideDone)
Game.GlobalEvent:RemoveEvent(GameEvent.Battle.AutoFightOnceEnd, this.WindowOnFocus)
end
function FightPointPassMainPanel:WindowOnFocus()
--刷新界面显示
LogError("刷新挂机界面显示")
this:RefreshWindowShow()
end
function FightPointPassMainPanel:RefreshWindowShow()
CheckRedPointStatus(RedPointType.XiaoYaoYouRedPoint)
CheckRedPointStatus(RedPointType.numberGame)
local curFightId = FightPointPassManager.curOpenFight
-- 功能引导存在时不再显示成长界面
if FightPointPassManager.GetIsOpenRewardUpTip() and not GuideManager.IsFunctionGuideExist() then
local oldLevelId = FightPointPassManager.lastPassFightId
local curLevelId = curFightId
local oldLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,oldLevelId)
local curLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,curLevelId)
local data = {}
data.title = "g_guanka_jianglitishen_zh"
data.itemList = {}
data.type = 1
for i = 1, #curLevelConFig.RewardShowMin do
local oldsinglePro = oldLevelConFig.RewardShowMin[i]
local cursinglePro = curLevelConFig.RewardShowMin[i]
local singleItem = {}
singleItem.icon = cursinglePro[1]
singleItem.proName = GetLanguageStrById(itemConfig[cursinglePro[1]].Name)
singleItem.proValue = oldsinglePro[2]
if cursinglePro[2] - oldsinglePro[2] > 0 then
singleItem.proValue1 = "<color=#529864>"..cursinglePro[2].."</color>"..Language[11567]
else
singleItem.proValue1 = "<color=#C8AD83>"..cursinglePro[2]..Language[11568]
end
table.insert(data.itemList,singleItem)
end
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook,data)
end
this.RefreshLittleMap()
this.RefreshPassGiftShow()
invadeMonster:OnShow()
local curName = GetLanguageStrById(fightLevelConfig[curFightId].Name)
local curDifficulty = fightLevelConfig[curFightId].Difficulty
local chapterId = 0
local str = ""
if not FightPointPassManager.IsChapterClossState() then
chapterId = math.floor(FightPointPassManager.lastPassFightId / 1000)
str = GetLanguageStrById(fightLevelConfig[FightPointPassManager.lastPassFightId].Name)
else
str = string.format("<color=#%s>%s</color> ", textColor[curDifficulty], curName)
chapterId = FightPointPassManager.GetCurChapterIndex()
end
this.areaName.text = str
if GetCurLanguage() ~= 0 then
this.areaName.gameObject.transform.localPosition = Vector2.New(0,0)
end
this.chapterName.text = GetLanguageStrById(fightLevelSetConfig[chapterId].Name)
-- 奖励预览
this.IntiReward()
-- 刷新关卡按钮状态
this.SetFightBtnText()
this.worldLv.text = PlayerManager.worldLeve
local openFunConFig = this.GetNextFightOpenFun()
if openFunConFig then
this.openFun:SetActive(true)
this.openFunNeedInfo.text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,openFunConFig.OpenRules[2]).Name
this.openFunFunInfo.text = Language[12163]..openFunConFig.Name
else
this.openFun:SetActive(false)
end --开服福利显示
this.UpdateOpenSeverWelfare()
-- 刷新任务显示
this.refreshVipTask()
-- 刷新解锁信息显示
this.RefreshOpenTips()
end
--界面打开时调用（用于子类重写）
function FightPointPassMainPanel:OnOpen(func)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.FightPointPass })
@ -688,7 +774,6 @@ end
--按钮开启限制
function this.BtnsIsOpen()
for i, v in pairs(this.funcBtnList) do
LogError("i==="..i)
local isOpen = ActTimeCtrlManager.SingleFuncState(i)
v:SetActive(isOpen)
end

22
Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
View File

@ -26,6 +26,8 @@ function InvadeMonsterView:InitComponent(gameObject, fightPointPassMainPanel)
this.btnFastExplore = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFastExplore")
this.btnAuto = Util.GetGameObject(self.gameObject, "Bg/jumpFight/btn")
this.btnAutoImg = Util.GetGameObject(self.gameObject, "Bg/jumpFight/Image")
--红点
this.expeditionRedPoint = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFastExplore/redPoint")
this.rewardBoxRedPoint = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/rewardBoxRedPoint")
@ -124,6 +126,15 @@ function InvadeMonsterView:BindEvent()
Util.AddClick(this.btnXinRen, function()
JumpManager.GoJump(36012)
end)
Util.AddClick(this.btnAuto, function()
if PlayerManager.isAutoFight then
PlayerManager.isAutoFight=false
else
PlayerManager.isAutoFight=true
end
this.btnAutoImg:SetActive(PlayerManager.isAutoFight)
end)
end
@ -208,7 +219,7 @@ function InvadeMonsterView:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.RefreshOnlineRewardShow)
Game.GlobalEvent:AddEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.OnRefreshRedPoint)
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.CheckBtnShow)
Game.GlobalEvent:AddEvent(GameEvent.UI.OnFocus, this.WindowOnFocus)
end
--移除事件监听（用于子类重写）
@ -220,13 +231,20 @@ function InvadeMonsterView:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.RefreshOnlineRewardShow)
Game.GlobalEvent:RemoveEvent(GameEvent.OnlineGift.GetOnlineRewardSuccess, this.OnRefreshRedPoint)
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.CheckBtnShow)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, this.WindowOnFocus)
end
function InvadeMonsterView:WindowOnFocus()
this.btnAutoImg:SetActive(PlayerManager.isAutoFight)
end
--界面打开时调用（用于子类重写）
function InvadeMonsterView:OnShow(...)
lastBoxState = 0
this:OnRefreshRedPoint()
this.btnAutoImg:SetActive(PlayerManager.isAutoFight)
this.SetBoxShow(1)
this:UpdataBoxStateShow()
-- 在线奖励

22
Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua
View File

@ -83,14 +83,22 @@ function this.StartFight()
PopupTipPanel.ShowTip(string.format(Language[10699], 1))
return
end
Log("请求战斗ID -- " .. FightPointPassManager.curOpenFight)
FightPointPassManager.oldLevel = PlayerManager.level
local MonsterGroupId = FightPointPassManager.GetBattleMonsterGroup()
FightPointPassManager.enterFightBattle = true
FightPointPassManager.ExecuteFightBattle(MonsterGroupId, FightPointPassManager.curOpenFight, function()
if PlayerManager.isAutoFight then
LogError("FightPointPassManager.curOpenFight=="..FightPointPassManager.curOpenFight.." this.root.curFormationIndex=="..this.root.curFormationIndex)
this.root:ClosePanel()
end)
NetManager.AutoFightRequest(FightPointPassManager.curOpenFight,this.root.curFormationIndex,function()
end)
else
Log("请求战斗ID -- " .. FightPointPassManager.curOpenFight)
FightPointPassManager.oldLevel = PlayerManager.level
local MonsterGroupId = FightPointPassManager.GetBattleMonsterGroup()
FightPointPassManager.enterFightBattle = true
FightPointPassManager.ExecuteFightBattle(MonsterGroupId, FightPointPassManager.curOpenFight, function()
this.root:ClosePanel()
end)
end
end
function this.On_Btn1_Click()
this.root.SetOneKeyGo()

61
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
View File

@ -7317,6 +7317,67 @@ function NetManager.StoreOneClickPurchaseRequest(_id)
end)
end
--自动战斗请求
local battleTimer=nil
function NetManager.AutoFightRequest(_fightId,_teamId,_func)
local data = FightInfoProto_pb.AutoFightRequest()
data.fightId=_fightId
data.teamId=_teamId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.AutoFightRequest,MessageTypeProto_pb.AutoFightResponse,msg,function(buffer)
local data = buffer:DataByte()
local msg = FightInfoProto_pb.AutoFightResponse()
msg:ParseFromString(data)
Game.GlobalEvent:DispatchEvent(GameEvent.Battle.AutoFightOnceEnd)
if msg.drop then
LogError("有掉落")
local isTop=UIManager.GetOpenPanel(UIName.FightPointPassMainPanel)
if isTop then
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
end
end
if battleTimer then
battleTimer:Stop()
battleTimer=nil
end
--如果有引导就返回
if GuideManager.IsFunctionGuideExist() or GuideManager.IsInMainGuide() then
return
end
LogError("FightPointPassManager.curOpenFight=="..FightPointPassManager.curOpenFight)
if msg.result==0 then
LogError("战斗失败,自动战斗停止")
UIManager.OpenPanel(UIName.BattleFailPopup, nil, false,nil,BATTLE_TYPE.MAP_FIGHT)
PlayerManager.isAutoFight=false
else
if not FightPointPassManager.IsChapterClossState() then
PlayerManager.isAutoFight=false
PopupTipPanel.ShowTip("章节未解锁")
return
end
--判断关卡是否可以战斗
local iscan,tip=FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight)
if iscan==false then
PlayerManager.isAutoFight=false
PopupTipPanel.ShowTip(tip)
return
end
battleTimer = Timer.New(function()
if PlayerManager.isAutoFight then
LogError("1111111111111111111111111111111")
NetManager.AutoFightRequest(FightPointPassManager.curOpenFight,FormationTypeDef.FORMATION_NORMAL,function()
end)
end
end,5,1,false)
battleTimer:Start()
end
if _func then
_func()
end
end)
end
return this

1
Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
View File

@ -28,6 +28,7 @@ this.MapView = 0
this.IsGetFiveStarHero = false
this.headBookListTag = 1
this.isAutoFight=false --主线是否自动战斗
this.now_index = 0
this.isCross = 0--是否已跨服 0 未 1 已跨服

18
Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
View File

@ -231,6 +231,20 @@ function RewardItemPopup:OnOpen(...)
SoundManager.PlaySound(SoundConfig.Sound_Reward)
this.ShowLvAndExp()
self:SelectCanPopUpBagMaxMessage()
if this.timer then
this.timer:Stop()
this.timer = nil
end
this.timer = Timer.New(function()
if isPlayerAniEnd then
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
PlayerManager.IsGetFiveStarHero = false
end
end
end,4):Start()
end
function this.InitGrid()
@ -646,6 +660,10 @@ function RewardItemPopup:OnDestroy()
end
itemListPrefab = {}
itemDataList = {}
if this.timer then
this.timer:Stop()
this.timer = nil
end
end
return RewardItemPopup

6
Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
View File

@ -35,9 +35,9 @@ namespace GameEditor.Core.DataConfig
private static void ShowConfigWin()
{
// 加载配置文件
LoadConfig();
m_CurGitBench = GitUtil.GetCurBenchName();
ServerBattleConfig.TryGetValue(m_CurGitBench, out m_CurServerBattlePath);
// LoadConfig();
// m_CurGitBench = GitUtil.GetCurBenchName();
// ServerBattleConfig.TryGetValue(m_CurGitBench, out m_CurServerBattlePath);
m_ExcelPath = EditorPrefs.GetString("m_ExcelPath");
m_BattleConfigPath = EditorPrefs.GetString("m_BattleConfigPath");