From f4a80c4a302083874ebad4c9870154fe61632638 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 15 Aug 2023 20:10:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E6=96=97?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 148 ++++++++++++------ bin/json/game_coin.json | 2 +- bin/json/game_fightglobalevent.json | 4 +- bin/json/game_stonetalent.json | 2 +- modules/battle/modelBattle.go | 15 +- sys/configure/structs/Game.BattleReadyData.go | 6 +- sys/configure/structs/Game.BuffType.go | 11 ++ .../structs/Game.HeroupstoryChapterData.go | 2 + sys/configure/structs/Game.StoneStoryData.go | 2 + 9 files changed, 132 insertions(+), 60 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 9a401b613..6418bb9b7 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -23,7 +23,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -51,7 +52,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -79,7 +81,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -107,7 +110,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -135,7 +139,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -163,7 +168,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -191,7 +197,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -219,7 +226,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -247,7 +255,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -275,7 +284,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -303,7 +313,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -331,7 +342,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -359,7 +371,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 10 }, @@ -387,7 +400,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -415,7 +429,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -443,7 +458,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -471,7 +487,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -499,7 +516,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -527,7 +545,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -555,7 +574,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -583,7 +603,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -611,7 +632,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -639,7 +661,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -667,7 +690,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -695,7 +719,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -723,7 +748,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -751,7 +777,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -779,7 +806,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -807,7 +835,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -835,7 +864,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -865,7 +895,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -895,7 +926,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -925,7 +957,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 100 }, @@ -953,7 +986,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -981,7 +1015,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1011,7 +1046,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 50 }, @@ -1041,7 +1077,8 @@ "HeroCheck": [ "13002" ], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1074,7 +1111,8 @@ "HeroCheck": [ "13002" ], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1102,7 +1140,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1110,7 +1149,7 @@ "id": 201, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_04", "battleScenes": [ "scenesfight_08" ], @@ -1132,7 +1171,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1140,7 +1180,7 @@ "id": 202, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_04", "battleScenes": [ "scenesfight_08" ], @@ -1162,7 +1202,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1170,7 +1211,7 @@ "id": 203, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_04", "battleScenes": [ "scenesfight_08" ], @@ -1192,7 +1233,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 720016, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1222,7 +1264,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1252,7 +1295,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1280,7 +1324,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 }, @@ -1288,9 +1333,9 @@ "id": 207, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_04", "battleScenes": [ - "scenesfight_05_01" + "scenesfight_08" ], "HideAlienSpace": 0, "ShowBuff": 0, @@ -1308,7 +1353,8 @@ "DisableHero": [], "LockSlots": [], "HeroCheck": [], - "AssistTeam": 0, + "RedAssistTeam": 0, + "BlueAssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 } diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 175f61c07..8f9ae2154 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -9,7 +9,7 @@ "color": 1, "effects": "", "access": [ - 123 + 11001 ], "img": "attr_gold", "intr": { diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json index 37f93cd33..b67a05c8d 100644 --- a/bin/json/game_fightglobalevent.json +++ b/bin/json/game_fightglobalevent.json @@ -225,7 +225,9 @@ "FightEndCheck": "", "AddCon": [], "Execution": 3, - "Args": [] + "Args": [ + "1" + ] }, { "Id": 13, diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json index f6cfb67ac..75b294070 100644 --- a/bin/json/game_stonetalent.json +++ b/bin/json/game_stonetalent.json @@ -831,7 +831,7 @@ "n": 2000 } ], - "PrivilegeId": 7, + "PrivilegeId": 6, "AttributeDesc": { "key": "", "text": "" diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index c27414f47..666d7aba5 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -153,8 +153,8 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon record.Redflist[0].Leadpos = captain } } - if conf.AssistTeam != 0 { - if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { + if conf.RedAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { return } record.Redflist[0].Backupteam = masters @@ -297,8 +297,8 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon record.Redflist[0].Leadpos = captain } } - if conf.AssistTeam != 0 { - if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { + if conf.RedAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { return } record.Redflist[0].Backupteam = masters @@ -322,6 +322,13 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon } } + if conf.BlueAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(200, 0, conf.BlueAssistTeam); errdata != nil { + return + } + record.Buleflist[0].Backupteam = masters + } + return } diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 5ceef83ec..17eec5a17 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -29,7 +29,8 @@ type GameBattleReadyData struct { DisableHero []string LockSlots []int32 HeroCheck []string - AssistTeam int32 + RedAssistTeam int32 + BlueAssistTeam int32 CanFriendHelp int32 Numrounds int32 } @@ -163,7 +164,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) } return diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index a18cee9b6..108cb0976 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -107,4 +107,15 @@ const ( GameBuffType_FIGHT_VOLITION = 114 GameBuffType_WEAKENS = 115 GameBuffType_CONCEAL = 116 + GameBuffType_BUFF_COUNT_ADD_BE_DMG = 117 + GameBuffType_TRE_BY_FRIEND_TRE = 118 + GameBuffType_HAS_BUFF_ADD_BE_DMG = 119 + GameBuffType_IGNORE_DEF_PER_HAS_PROB = 120 + GameBuffType_ADJUST_PRO_BY_PRO = 121 + GameBuffType_ADJUST_PRO_BY_REAL_DMG = 122 + GameBuffType_ADJUST_PRO_BY_PRO_OVERFLOW = 123 + GameBuffType_HAS_SHIELD_REFLEX_DMG = 124 + GameBuffType_ADJUST_PRO_FULL_EMIT_SKILL = 125 + GameBuffType_APPEND_DMG = 126 + GameBuffType_PRO_HIGH_IGNORE_IMMUNITY = 127 ) diff --git a/sys/configure/structs/Game.HeroupstoryChapterData.go b/sys/configure/structs/Game.HeroupstoryChapterData.go index 910be59f4..b67d0ed3a 100644 --- a/sys/configure/structs/Game.HeroupstoryChapterData.go +++ b/sys/configure/structs/Game.HeroupstoryChapterData.go @@ -24,6 +24,7 @@ type GameHeroupstoryChapterData struct { Startstory int32 Battle int32 Reward []*Gameatn + Tipstxt string Txt string Circle string Qq int32 @@ -95,6 +96,7 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.StoneStoryData.go b/sys/configure/structs/Game.StoneStoryData.go index 4744a576b..1f4dae00f 100644 --- a/sys/configure/structs/Game.StoneStoryData.go +++ b/sys/configure/structs/Game.StoneStoryData.go @@ -14,6 +14,7 @@ type GameStoneStoryData struct { Id int32 StoryGroupId int32 StepId int32 + TitleName string StoryDesc string OptionEventIdGroup1 []string EndEventId1 int32 @@ -36,6 +37,7 @@ func (_v *GameStoneStoryData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StoryGroupId"].(float64); !_ok_ { err = errors.New("StoryGroupId error"); return }; _v.StoryGroupId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StepId"].(float64); !_ok_ { err = errors.New("StepId error"); return }; _v.StepId = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["TitleName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["StoryDesc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StoryDesc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StoryDesc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} From 65502bbe67097c4fdc043f5a96317d1baa850f97 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 15 Aug 2023 20:12:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E6=96=97?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/battle/modelBattle.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index 666d7aba5..f8cadd949 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -56,17 +56,17 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon Tasks: conf.BattleEvents, } var ( - battletas *cfg.GameBattletasktestingData - captain int32 - masters []*pb.BattleRole - user *pb.DBUserExpand - err error + // battletas *cfg.GameBattletasktestingData + captain int32 + masters []*pb.BattleRole + user *pb.DBUserExpand + err error // buff *cfg.GamePandamasBuffData ) // buff, _ = this.getGlobalBuff(session.GetUserId()) - if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil { - record.Tasks = battletas.BattletaskTestingId - } + // if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil { + // record.Tasks = battletas.BattletaskTestingId + // } if user, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, From d732f0ce4aed6857872b4addb56d3836d8cf8990 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 15 Aug 2023 20:42:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BF?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=98=E6=96=97=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mainline/api_challenge.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 2e97fbdcf..c7c9c26e6 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -98,6 +98,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, + Tasks: record.Tasks, }, Level: req.Level, })