liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-05-26 13:39:00 +08:00
commit 0c3b382923
17 changed files with 12026 additions and 1027 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_buriedcondi.json
View File

@ -1,8 +1,8 @@
[
{
"id": 101,
"rtype": 2,
"type_sp": 0,
"rtype": 1,
"type_sp": 1,
"tasktxt": {
"key": "Localize_Localize_Program_tasktxt_1",
"text": ""

1676
bin/json/game_buriedtype.json Normal file
View File

File diff suppressed because it is too large Load Diff

9200
bin/json/game_equipattrlibrarys.json Normal file
View File

File diff suppressed because it is too large Load Diff

12
bin/json/game_rdtaskcondi.json
View File

@ -7586,15 +7586,15 @@
"data": 2,
"type_sp": 1,
"tasktxt": {
"key": "觉醒副本3次",
"text": "觉醒副本3次"
"key": "狩猎1boss1难度3次",
"text": "狩猎1boss1难度3次"
},
"type": 0,
"type": 80,
"valid": 0,
"NPC": 10231,
"data1": 0,
"data2": 0,
"data3": 0,
"data1": 1,
"data2": 3,
"data3": 1,
"data4": 0,
"data5": 0
},

74
bin/json/game_skillafteratk.json
View File

@ -11484,6 +11484,27 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 31,
"Argu": [
150
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245003213,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001125,
@ -11501,7 +11522,7 @@
"RevisiParams": []
},
{
"Id": 245003213,
"Id": 245003214,
"EmitPR": 1000,
"From": 1,
"Where": [],
@ -14657,7 +14678,7 @@
"Argu": [
1,
4,
1300
4000
],
"FollowSK": [],
"SucFollowSK": [],
@ -14727,7 +14748,7 @@
"Argu": [
1,
4,
2200
4500
],
"FollowSK": [],
"SucFollowSK": [
@ -14776,7 +14797,7 @@
"Argu": [
1,
4,
2600
6000
],
"FollowSK": [],
"SucFollowSK": [],
@ -17063,16 +17084,16 @@
{
"Id": 234003311,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "",
"Limit": 10,
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1100
6000
],
"FollowSK": [],
"SucFollowSK": [
@ -17095,9 +17116,8 @@
"ExecuteCnt": 1,
"Type": 32,
"Argu": [
1,
1,
10
3,
-1
],
"FollowSK": [],
"SucFollowSK": [
@ -18269,8 +18289,7 @@
"Type": 32,
"Argu": [
3,
1,
2
1
],
"FollowSK": [],
"SucFollowSK": [],
@ -18284,19 +18303,21 @@
{
"Id": 214005211,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "Type=Rand",
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
1,
4,
750
1500
],
"FollowSK": [],
"SucFollowSK": [],
"SucFollowSK": [
214005212
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -18316,7 +18337,7 @@
"Argu": [
1,
1,
0
3
],
"FollowSK": [],
"SucFollowSK": [],
@ -18341,9 +18362,7 @@
1,
-1
],
"FollowSK": [
214005214
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -18405,19 +18424,19 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "Type=Rand",
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
900
5000
],
"FollowSK": [
"FollowSK": [],
"SucFollowSK": [
214005313
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -18436,7 +18455,6 @@
"Type": 32,
"Argu": [
3,
2,
2
],
"FollowSK": [],
@ -22691,9 +22709,7 @@
1,
1
],
"FollowSK": [
255002213
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,

1414
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

540
bin/json/game_skillbuff.json
View File

File diff suppressed because it is too large Load Diff

12
bin/json/game_skillpassive.json
View File

@ -573,7 +573,9 @@
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
245003212
245003212,
245003213,
245003214
]
},
{
@ -1064,7 +1066,7 @@
"Id": 414005211,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2,Hasbuff=3",
"TargetCheck": "Target=2,Nobuff=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
@ -1747,7 +1749,9 @@
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"AddCon": [
"SelfNoBuff=390001448"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -2447,7 +2451,7 @@
},
{
"Id": 455002213,
"When": 2,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",

6
comm/error.go
View File

@ -1,6 +1,7 @@
package comm
import (
"fmt"
"go_dreamfactory/pb"
"github.com/pkg/errors"
@ -22,3 +23,8 @@ func NewCustomError(code pb.ErrorCode) error {
Message: code.String(),
}, "")
}
//创建配置表错误对象
func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error {
return fmt.Errorf("服务端配置未找到!模块:%s ,配置文件:%s,目标数据:%v", moduleName, filename, id)
}

4
modules/academy/api_receive.go
View File

@ -34,6 +34,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
}
if level, err = this.module.configure.getGameTeaching(req.Level); err != nil {
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
}
return
}
if req.Report.Completetask == nil || len(req.Report.Completetask) != len(level.Task) {

3
modules/academy/configure.go
View File

@ -2,6 +2,7 @@ package academy
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
cfg "go_dreamfactory/sys/configure/structs"
@ -37,7 +38,7 @@ func (this *configureComp) getGameTeaching(id int32) (result *cfg.GameTeachingDa
this.module.Errorln(err)
} else {
if result, ok = v.(*cfg.GameTeaching).GetDataMap()[id]; !ok {
err = fmt.Errorf("on found GameMonster:%d", id)
err = comm.NewNotFoundConfErr(moduleName, game_teaching, id)
this.module.Errorln(err)
}
}

2
modules/academy/module.go
View File

@ -7,6 +7,8 @@ import (
"go_dreamfactory/modules"
)
const moduleName = "联盟学院"
/*
模块名:联盟学院
描述:新手训练营

7
modules/buried/core.go
View File

@ -3,7 +3,6 @@ package buried
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
@ -78,9 +77,3 @@ func checkburied(buried *comm.BuriedParam, conf *cfg.GameBuriedCondiData) (effic
efficient = true
return
}
//更新埋点数据
func updateburied(buried *comm.TaskParam, conf *cfg.GameBuriedCondiData, data *pb.DBBuriedItem) (err error) {
return
}

3
modules/horoscope/api_upgrade.go
View File

@ -52,6 +52,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade
return
}
info.Nodes[conf.NodeId] = conf.Lv + 1
if info.Nodes[conf.NodeId] == 1 { //解锁
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype173, 1))
}
if err = this.module.modelHoroscope.updateInfo(session, info); err != nil {
code = pb.ErrorCode_DBError
return

42
sys/configure/structs/Game.BuriedType.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameBuriedType struct {
_dataMap map[int32]*GameBuriedTypeData
_dataList []*GameBuriedTypeData
}
func NewGameBuriedType(_buf []map[string]interface{}) (*GameBuriedType, error) {
_dataList := make([]*GameBuriedTypeData, 0, len(_buf))
dataMap := make(map[int32]*GameBuriedTypeData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameBuriedTypeData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameBuriedType{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameBuriedType) GetDataMap() map[int32]*GameBuriedTypeData {
return table._dataMap
}
func (table *GameBuriedType) GetDataList() []*GameBuriedTypeData {
return table._dataList
}
func (table *GameBuriedType) Get(key int32) *GameBuriedTypeData {
return table._dataMap[key]
}

47
sys/configure/structs/Game.BuriedTypeData.go Normal file
View File

@ -0,0 +1,47 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameBuriedTypeData struct {
Id int32
Insert int32
Desc string
Data1 string
Data2 string
Data3 string
Data4 string
}
const TypeId_GameBuriedTypeData = -452590967
func (*GameBuriedTypeData) GetTypeId() int32 {
return -452590967
}
func (_v *GameBuriedTypeData)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["insert"].(float64); !_ok_ { err = errors.New("insert error"); return }; _v.Insert = int32(_tempNum_) }
{ var _ok_ bool; if _v.Desc, _ok_ = _buf["desc"].(string); !_ok_ { err = errors.New("desc error"); return } }
{ var _ok_ bool; if _v.Data1, _ok_ = _buf["data1"].(string); !_ok_ { err = errors.New("data1 error"); return } }
{ var _ok_ bool; if _v.Data2, _ok_ = _buf["data2"].(string); !_ok_ { err = errors.New("data2 error"); return } }
{ var _ok_ bool; if _v.Data3, _ok_ = _buf["data3"].(string); !_ok_ { err = errors.New("data3 error"); return } }
{ var _ok_ bool; if _v.Data4, _ok_ = _buf["data4"].(string); !_ok_ { err = errors.New("data4 error"); return } }
return
}
func DeserializeGameBuriedTypeData(_buf map[string]interface{}) (*GameBuriedTypeData, error) {
v := &GameBuriedTypeData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

7
sys/configure/structs/Tables.go
View File

@ -197,6 +197,7 @@ type Tables struct {
HeroTalent *GameHeroTalent
TalentBox *GameTalentBox
BuriedCondi *GameBuriedCondi
BuriedType *GameBuriedType
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -1320,5 +1321,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.BuriedCondi, err = NewGameBuriedCondi(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_buriedtype") ; err != nil {
return nil, err
}
if tables.BuriedType, err = NewGameBuriedType(buf) ; err != nil {
return nil, err
}
return tables, nil
}