diff --git a/bin/json/game_eventlottery.json b/bin/json/game_eventlottery.json index eaf92d961..fbea78926 100644 --- a/bin/json/game_eventlottery.json +++ b/bin/json/game_eventlottery.json @@ -8,7 +8,7 @@ "SubGroupType": 1, "EventID": 16010101, "SubGroupNum": 2, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 2, @@ -19,7 +19,7 @@ "SubGroupType": 1, "EventID": 16010101, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 3, @@ -30,7 +30,7 @@ "SubGroupType": 1, "EventID": 16010101, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 4, @@ -41,7 +41,7 @@ "SubGroupType": 0, "EventID": 17002003, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 5, @@ -52,7 +52,7 @@ "SubGroupType": 1, "EventID": 14110101, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 6, @@ -63,7 +63,7 @@ "SubGroupType": 0, "EventID": 14110102, "SubGroupNum": 0, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 7, @@ -74,7 +74,7 @@ "SubGroupType": 0, "EventID": 14110103, "SubGroupNum": 0, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 8, @@ -85,7 +85,7 @@ "SubGroupType": 1, "EventID": 14110104, "SubGroupNum": 1, - "EventWt": 500 + "EventWt": 1000 }, { "Id": 9, @@ -96,7 +96,7 @@ "SubGroupType": 0, "EventID": 14110105, "SubGroupNum": 0, - "EventWt": 500 + "EventWt": 1000 }, { "Id": 10, @@ -107,7 +107,7 @@ "SubGroupType": 1, "EventID": 28110501, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 11, @@ -118,7 +118,7 @@ "SubGroupType": 1, "EventID": 12100001, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 12, @@ -129,7 +129,7 @@ "SubGroupType": 1, "EventID": 12100002, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 13, @@ -140,7 +140,7 @@ "SubGroupType": 0, "EventID": 12100003, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 14, @@ -151,7 +151,7 @@ "SubGroupType": 0, "EventID": 12100004, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 15, @@ -162,7 +162,7 @@ "SubGroupType": 0, "EventID": 12100005, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 16, @@ -173,7 +173,7 @@ "SubGroupType": 0, "EventID": 12100006, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 17, @@ -184,7 +184,7 @@ "SubGroupType": 1, "EventID": 10000001, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 18, @@ -195,7 +195,7 @@ "SubGroupType": 1, "EventID": 10000002, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 19, @@ -206,7 +206,7 @@ "SubGroupType": 1, "EventID": 10000003, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 20, @@ -217,7 +217,7 @@ "SubGroupType": 1, "EventID": 10000004, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 21, @@ -228,7 +228,7 @@ "SubGroupType": 1, "EventID": 10000005, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 22, @@ -239,7 +239,7 @@ "SubGroupType": 1, "EventID": 10000006, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 23, @@ -250,7 +250,7 @@ "SubGroupType": 1, "EventID": 10000007, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 24, @@ -261,7 +261,7 @@ "SubGroupType": 1, "EventID": 10000008, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 }, { "Id": 25, @@ -272,6 +272,6 @@ "SubGroupType": 1, "EventID": 11000000, "SubGroupNum": 1, - "EventWt": 50 + "EventWt": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_heroupstorychapter.json b/bin/json/game_heroupstorychapter.json index bbd526811..d9dbb5e1a 100644 --- a/bin/json/game_heroupstorychapter.json +++ b/bin/json/game_heroupstorychapter.json @@ -3,6 +3,7 @@ "key": 1, "onlevel": 0, "chapter": 2500101, + "hero": 25001, "onlevelstory": [], "point": { "x": 0, @@ -33,6 +34,7 @@ "key": 2, "onlevel": 1, "chapter": 2500101, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -65,6 +67,7 @@ "key": 3, "onlevel": 1, "chapter": 2500101, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -97,6 +100,7 @@ "key": 4, "onlevel": 3, "chapter": 2500101, + "hero": 25001, "onlevelstory": [], "point": { "x": 2, @@ -124,6 +128,7 @@ "key": 5, "onlevel": 4, "chapter": 2500101, + "hero": 25001, "onlevelstory": [], "point": { "x": 3, @@ -156,6 +161,7 @@ "key": 6, "onlevel": 4, "chapter": 2500102, + "hero": 25001, "onlevelstory": [], "point": { "x": 0, @@ -186,6 +192,7 @@ "key": 7, "onlevel": 6, "chapter": 2500102, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -218,6 +225,7 @@ "key": 8, "onlevel": 6, "chapter": 2500102, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -250,6 +258,7 @@ "key": 9, "onlevel": 8, "chapter": 2500102, + "hero": 25001, "onlevelstory": [], "point": { "x": 2, @@ -277,6 +286,7 @@ "key": 10, "onlevel": 7, "chapter": 2500102, + "hero": 25001, "onlevelstory": [], "point": { "x": 3, @@ -309,6 +319,7 @@ "key": 11, "onlevel": 9, "chapter": 2500103, + "hero": 25001, "onlevelstory": [], "point": { "x": 0, @@ -339,6 +350,7 @@ "key": 12, "onlevel": 11, "chapter": 2500103, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -371,6 +383,7 @@ "key": 13, "onlevel": 11, "chapter": 2500103, + "hero": 25001, "onlevelstory": [], "point": { "x": 1, @@ -403,6 +416,7 @@ "key": 14, "onlevel": 13, "chapter": 2500103, + "hero": 25001, "onlevelstory": [], "point": { "x": 2, @@ -430,6 +444,7 @@ "key": 15, "onlevel": 14, "chapter": 2500103, + "hero": 25001, "onlevelstory": [], "point": { "x": 3, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index f01a28eab..83cc1ffaa 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -1121,9 +1121,7 @@ "EditorStage": 0, "venturemodel": "", "venturetype": 0, - "ventureavatar": [ - "Person/13002/13002_q.prefab" - ], + "ventureavatar": [], "herocolor": 1, "heroimg": "zxgq_qp_icon_zd", "bubbletext": { @@ -7011,7 +7009,7 @@ 100201 ], "previoustage": 0, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "EditorStage": 0, "venturemodel": "", @@ -7112,12 +7110,12 @@ { "id": 1100203, "chapterid": 11002, - "group_id": 100202, + "group_id": 100203, "previous_group_id": [ - 100201 + 100202 ], "previoustage": 0, - "Episodetype": 4, + "Episodetype": 1, "openlevel": 1, "EditorStage": 0, "venturemodel": "", @@ -7218,9 +7216,9 @@ { "id": 1100204, "chapterid": 11002, - "group_id": 100203, + "group_id": 100204, "previous_group_id": [ - 100202 + 100203 ], "previoustage": 0, "Episodetype": 1, @@ -7324,9 +7322,9 @@ { "id": 1100205, "chapterid": 11002, - "group_id": 100204, + "group_id": 100205, "previous_group_id": [ - 100203 + 100204 ], "previoustage": 0, "Episodetype": 1, @@ -7430,9 +7428,9 @@ { "id": 1100206, "chapterid": 11002, - "group_id": 100205, + "group_id": 100206, "previous_group_id": [ - 100204 + 100205 ], "previoustage": 0, "Episodetype": 3, @@ -7536,9 +7534,9 @@ { "id": 1100207, "chapterid": 11002, - "group_id": 100206, + "group_id": 100207, "previous_group_id": [ - 100205 + 100206 ], "previoustage": 0, "Episodetype": 1, @@ -7642,9 +7640,9 @@ { "id": 1100208, "chapterid": 11002, - "group_id": 100207, + "group_id": 100208, "previous_group_id": [ - 100206 + 100207 ], "previoustage": 0, "Episodetype": 1, @@ -7748,9 +7746,9 @@ { "id": 1100209, "chapterid": 11002, - "group_id": 100208, + "group_id": 100209, "previous_group_id": [ - 100207 + 100208 ], "previoustage": 0, "Episodetype": 1, @@ -7854,9 +7852,9 @@ { "id": 1100210, "chapterid": 11002, - "group_id": 100209, + "group_id": 100210, "previous_group_id": [ - 100208 + 100209 ], "previoustage": 0, "Episodetype": 6, @@ -7960,9 +7958,9 @@ { "id": 1100211, "chapterid": 11002, - "group_id": 100210, + "group_id": 100211, "previous_group_id": [ - 100209 + 100210 ], "previoustage": 0, "Episodetype": 1, @@ -8066,9 +8064,9 @@ { "id": 1100212, "chapterid": 11002, - "group_id": 100211, + "group_id": 100212, "previous_group_id": [ - 100210 + 100211 ], "previoustage": 0, "Episodetype": 7, @@ -8174,7 +8172,7 @@ "chapterid": 11003, "group_id": 100301, "previous_group_id": [ - 100211 + 100212 ], "previoustage": 0, "Episodetype": 1, @@ -8279,7 +8277,9 @@ "id": 1100214, "chapterid": 11003, "group_id": 100302, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -8383,7 +8383,9 @@ "id": 1100215, "chapterid": 11003, "group_id": 100303, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -8487,7 +8489,9 @@ "id": 1100216, "chapterid": 11004, "group_id": 100304, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -8591,7 +8595,9 @@ "id": 1100217, "chapterid": 11004, "group_id": 100305, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -8695,7 +8701,9 @@ "id": 1100218, "chapterid": 11004, "group_id": 100306, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -8799,7 +8807,9 @@ "id": 1100219, "chapterid": 11004, "group_id": 100307, - "previous_group_id": [], + "previous_group_id": [ + 100212 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json index 5b1555b9e..4e4021a2b 100644 --- a/bin/json/game_stoneroom.json +++ b/bin/json/game_stoneroom.json @@ -45,9 +45,9 @@ "PortalName": "portal_1", "EventrewardGroup": 16010100, "EventBattleGroup": 14110100, - "EventStoryNpcGroup": 0, - "EventTreasureGroup": 0, - "EventStoreGroup": 0, + "EventStoryNpcGroup": 12100000, + "EventTreasureGroup": 10000001, + "EventStoreGroup": 11000000, "BossEvent": 0, "Condition": [ 14 diff --git a/comm/imodule.go b/comm/imodule.go index 25358871e..08e4cf811 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -625,4 +625,8 @@ type ( IUiGame interface { HDPSTodayConsum(uid string, ps int32) // 今日消耗的体力 } + + IStonehenge interface { + GmAddStoneEvent(uid string, eventid int32) + } ) diff --git a/modules/gm/module.go b/modules/gm/module.go index f4d718124..1ead4fd08 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -578,6 +578,31 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er } module1.(comm.IPagoda).GMModifyRacePagoda(session.GetUserId(), int32(num1), int32(num2)) + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + ) + } else if len(datas) == 2 && (datas[0] == "stone") { // gm + var ( + num1 int + err error + ) + module1, err := this.service.GetModule(comm.ModuleStone) + if err != nil { + return + } + + num1, err = strconv.Atoi(datas[1]) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + + module1.(comm.IStonehenge).GmAddStoneEvent(session.GetUserId(), int32(num1)) + this.Debug("使用bingo命令:uid = %s ", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "0", Value: datas[0]}, diff --git a/modules/stonehenge/module.go b/modules/stonehenge/module.go index 90f3bd287..c05e5f5dc 100644 --- a/modules/stonehenge/module.go +++ b/modules/stonehenge/module.go @@ -64,3 +64,18 @@ func (this *Stonehenge) Rpc_ModuleStoneBossSettlement(ctx context.Context, req * this.modelStonehenge.reLoadStoneBoos() return } + +// gm 加事件 +func (this *Stonehenge) GmAddStoneEvent(uid string, eventid int32) { + if stone, err := this.modelStonehenge.GetStonehengeData(uid); err == nil { + if stone.Rooms != nil { + stone.Rooms.Eventid[eventid] = false + update := make(map[string]interface{}) + update["rooms"] = stone.Rooms + this.modelStonehenge.ChangeStonehengeData(uid, update) + } + + return + } + return +} diff --git a/modules/storyline/api_complete.go b/modules/storyline/api_complete.go index 09a21d86f..749cded0a 100644 --- a/modules/storyline/api_complete.go +++ b/modules/storyline/api_complete.go @@ -52,14 +52,14 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple return } - if item, ok = info.Item[conf.Hero]; !ok { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: fmt.Sprintf("no activation hero:%d", conf.Hero), - } - return - } + // if item, ok = info.Item[conf.Hero]; !ok { + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_ReqParameterError, + // Title: pb.ErrorCode_ReqParameterError.ToString(), + // Message: fmt.Sprintf("no activation hero:%d", conf.Hero), + // } + // return + // } //前置判断 if conf.Onlevel != 0 && item.Level[conf.Onlevel] == 0 { errdata = &pb.ErrorData{ diff --git a/sys/configure/structs/Game.HeroupstoryChapterData.go b/sys/configure/structs/Game.HeroupstoryChapterData.go index 70c5579f1..910be59f4 100644 --- a/sys/configure/structs/Game.HeroupstoryChapterData.go +++ b/sys/configure/structs/Game.HeroupstoryChapterData.go @@ -15,6 +15,7 @@ type GameHeroupstoryChapterData struct { Key int32 Onlevel int32 Chapter int32 + Hero int32 Onlevelstory []int32 Point serialization.Vector2 Level int32 @@ -40,6 +41,7 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool