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:
liwei1dao 2022-08-18 19:55:57 +08:00
commit f73ca86f97
10 changed files with 965 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

459
bin/json/game_skill.json
View File

@ -6736,7 +6736,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004011
]
}
],
"Desc": [
"skill_1250040111"
],
@ -6761,7 +6767,38 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004111
]
},
{
"Id": [
225004112
]
},
{
"Id": [
225004113
]
},
{
"Id": [
225004114
]
},
{
"Id": [
225004115
]
},
{
"Id": [
225004116
]
}
],
"Desc": [
"skill_1250041111",
"skill_1250041112",
@ -6788,7 +6825,29 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004211,
225004212,
225004213
]
},
{
"Id": [
225004211,
225004212,
225004213
]
},
{
"Id": [
225004211,
225004212,
225004213
]
}
],
"Desc": [
"skill_1250042111",
"skill_1250042112",
@ -6814,7 +6873,33 @@
4
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004311
]
},
{
"Id": [
225004312
]
},
{
"Id": [
225004313
]
},
{
"Id": [
225004314
]
},
{
"Id": [
225004315
]
}
],
"Desc": [
"skill_1250043111",
"skill_1250043112",
@ -6838,7 +6923,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002011
]
}
],
"Desc": [
"skill_1350020111"
],
@ -6863,7 +6954,44 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002111,
235002112
]
},
{
"Id": [
235002111,
235002122
]
},
{
"Id": [
235002111,
235002132
]
},
{
"Id": [
235002111,
235002142
]
},
{
"Id": [
235002111,
235002152
]
},
{
"Id": [
235002111,
235002162
]
}
],
"Desc": [
"skill_1350021111",
"skill_1350021112",
@ -6888,7 +7016,14 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002211,
235002212
]
}
],
"Desc": [
"skill_1350022111"
],
@ -6913,7 +7048,38 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002311
]
},
{
"Id": [
235002312
]
},
{
"Id": [
235002313
]
},
{
"Id": [
235002314
]
},
{
"Id": [
235002315
]
},
{
"Id": [
235002316
]
}
],
"Desc": [
"skill_1350023111",
"skill_1350023112",
@ -6943,7 +7109,38 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
935002311
]
},
{
"Id": [
935002312
]
},
{
"Id": [
935002313
]
},
{
"Id": [
935002314
]
},
{
"Id": [
935002315
]
},
{
"Id": [
935002316
]
}
],
"Desc": [
"skill_9350023211",
"skill_9350023212",
@ -6968,7 +7165,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003011
]
}
],
"Desc": [
"skill_1240030111"
],
@ -6992,7 +7195,44 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003111,
224003112
]
},
{
"Id": [
224003121,
224003122
]
},
{
"Id": [
224003131,
224003132
]
},
{
"Id": [
224003141,
224003142
]
},
{
"Id": [
224003151,
224003152
]
},
{
"Id": [
224003161,
224003162
]
}
],
"Desc": [
"skill_1240031111",
"skill_1240031112",
@ -7017,7 +7257,20 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003211,
224003212
]
},
{
"Id": [
224003211,
224003212
]
}
],
"Desc": [
"skill_1240032111",
"skill_1240032112"
@ -7043,7 +7296,50 @@
3
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003311,
224003312,
224003313
]
},
{
"Id": [
224003311,
224003322,
224003323
]
},
{
"Id": [
224003311,
224003332,
224003333
]
},
{
"Id": [
224003311,
224003342,
224003343
]
},
{
"Id": [
224003311,
224003352,
224003353
]
},
{
"Id": [
224003311,
224003362,
224003363
]
}
],
"Desc": [
"skill_1240033111",
"skill_1240033112",
@ -7069,7 +7365,22 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
924003411,
924003412,
924003413
]
},
{
"Id": [
924003411,
924003412,
924003413
]
}
],
"Desc": [
"skill_9240034111",
"skill_9240034112"
@ -7090,7 +7401,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006011
]
}
],
"Desc": [],
"buffid": []
},
@ -7112,7 +7429,33 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006111
]
},
{
"Id": [
234006121
]
},
{
"Id": [
234006131
]
},
{
"Id": [
234006141
]
},
{
"Id": [
234006151
]
}
],
"Desc": [],
"buffid": []
},
@ -7134,7 +7477,33 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006211
]
},
{
"Id": [
234006221
]
},
{
"Id": [
234006231
]
},
{
"Id": [
234006241
]
},
{
"Id": [
234006251
]
}
],
"Desc": [],
"buffid": []
},
@ -7156,7 +7525,33 @@
3
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006311
]
},
{
"Id": [
234006321
]
},
{
"Id": [
234006331
]
},
{
"Id": [
234006341
]
},
{
"Id": [
234006351
]
}
],
"Desc": [],
"buffid": []
},
@ -7178,7 +7573,33 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
934006211
]
},
{
"Id": [
934006221
]
},
{
"Id": [
934006231
]
},
{
"Id": [
934006241
]
},
{
"Id": [
934006251
]
}
],
"Desc": [],
"buffid": []
}

459
bin/json/game_skillatk.json
View File

@ -6736,7 +6736,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004011
]
}
],
"Desc": [
"skill_1250040111"
],
@ -6761,7 +6767,38 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004111
]
},
{
"Id": [
225004112
]
},
{
"Id": [
225004113
]
},
{
"Id": [
225004114
]
},
{
"Id": [
225004115
]
},
{
"Id": [
225004116
]
}
],
"Desc": [
"skill_1250041111",
"skill_1250041112",
@ -6788,7 +6825,29 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004211,
225004212,
225004213
]
},
{
"Id": [
225004211,
225004212,
225004213
]
},
{
"Id": [
225004211,
225004212,
225004213
]
}
],
"Desc": [
"skill_1250042111",
"skill_1250042112",
@ -6814,7 +6873,33 @@
4
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
225004311
]
},
{
"Id": [
225004312
]
},
{
"Id": [
225004313
]
},
{
"Id": [
225004314
]
},
{
"Id": [
225004315
]
}
],
"Desc": [
"skill_1250043111",
"skill_1250043112",
@ -6838,7 +6923,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002011
]
}
],
"Desc": [
"skill_1350020111"
],
@ -6863,7 +6954,44 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002111,
235002112
]
},
{
"Id": [
235002111,
235002122
]
},
{
"Id": [
235002111,
235002132
]
},
{
"Id": [
235002111,
235002142
]
},
{
"Id": [
235002111,
235002152
]
},
{
"Id": [
235002111,
235002162
]
}
],
"Desc": [
"skill_1350021111",
"skill_1350021112",
@ -6888,7 +7016,14 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002211,
235002212
]
}
],
"Desc": [
"skill_1350022111"
],
@ -6913,7 +7048,38 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
235002311
]
},
{
"Id": [
235002312
]
},
{
"Id": [
235002313
]
},
{
"Id": [
235002314
]
},
{
"Id": [
235002315
]
},
{
"Id": [
235002316
]
}
],
"Desc": [
"skill_1350023111",
"skill_1350023112",
@ -6943,7 +7109,38 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
935002311
]
},
{
"Id": [
935002312
]
},
{
"Id": [
935002313
]
},
{
"Id": [
935002314
]
},
{
"Id": [
935002315
]
},
{
"Id": [
935002316
]
}
],
"Desc": [
"skill_9350023211",
"skill_9350023212",
@ -6968,7 +7165,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003011
]
}
],
"Desc": [
"skill_1240030111"
],
@ -6992,7 +7195,44 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003111,
224003112
]
},
{
"Id": [
224003121,
224003122
]
},
{
"Id": [
224003131,
224003132
]
},
{
"Id": [
224003141,
224003142
]
},
{
"Id": [
224003151,
224003152
]
},
{
"Id": [
224003161,
224003162
]
}
],
"Desc": [
"skill_1240031111",
"skill_1240031112",
@ -7017,7 +7257,20 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003211,
224003212
]
},
{
"Id": [
224003211,
224003212
]
}
],
"Desc": [
"skill_1240032111",
"skill_1240032112"
@ -7043,7 +7296,50 @@
3
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
224003311,
224003312,
224003313
]
},
{
"Id": [
224003311,
224003322,
224003323
]
},
{
"Id": [
224003311,
224003332,
224003333
]
},
{
"Id": [
224003311,
224003342,
224003343
]
},
{
"Id": [
224003311,
224003352,
224003353
]
},
{
"Id": [
224003311,
224003362,
224003363
]
}
],
"Desc": [
"skill_1240033111",
"skill_1240033112",
@ -7069,7 +7365,22 @@
3
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
924003411,
924003412,
924003413
]
},
{
"Id": [
924003411,
924003412,
924003413
]
}
],
"Desc": [
"skill_9240034111",
"skill_9240034112"
@ -7090,7 +7401,13 @@
-1
],
"Target": 1,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006011
]
}
],
"Desc": [],
"buffid": []
},
@ -7112,7 +7429,33 @@
0
],
"Target": 4,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006111
]
},
{
"Id": [
234006121
]
},
{
"Id": [
234006131
]
},
{
"Id": [
234006141
]
},
{
"Id": [
234006151
]
}
],
"Desc": [],
"buffid": []
},
@ -7134,7 +7477,33 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006211
]
},
{
"Id": [
234006221
]
},
{
"Id": [
234006231
]
},
{
"Id": [
234006241
]
},
{
"Id": [
234006251
]
}
],
"Desc": [],
"buffid": []
},
@ -7156,7 +7525,33 @@
3
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
234006311
]
},
{
"Id": [
234006321
]
},
{
"Id": [
234006331
]
},
{
"Id": [
234006341
]
},
{
"Id": [
234006351
]
}
],
"Desc": [],
"buffid": []
},
@ -7178,7 +7573,33 @@
4
],
"Target": 2,
"ChildSkill": [],
"ChildSkill": [
{
"Id": [
934006211
]
},
{
"Id": [
934006221
]
},
{
"Id": [
934006231
]
},
{
"Id": [
934006241
]
},
{
"Id": [
934006251
]
}
],
"Desc": [],
"buffid": []
}

6
cmd/robot/friend.go
View File

@ -72,14 +72,14 @@ var (
desc: "添加黑名单",
mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeAddBlack,
req: &pb.FriendBlackAddReq{
req: &pb.FriendAddBlackReq{
FriendId: "0_62ccd236e799cee5e7c97930",
},
rsp: &pb.FriendBlackAddResp{},
rsp: &pb.FriendAddBlackResp{},
// enabled: true,
next: func(robot *Robot, rsp proto.Message) {
tcs := []*TestCase{}
if r, ok := rsp.(*pb.FriendBlackAddResp); ok {
if r, ok := rsp.(*pb.FriendAddBlackResp); ok {
tc := &TestCase{
desc: "删除黑名单",
mainType: string(comm.ModuleFriend),

6
cmd/v2/lib/common/constant.go
View File

@ -19,3 +19,9 @@ const (
CONFIG_SERVICE_NAME = "name"
CONFIG_SERVICE_URL = "url"
)
const (
BOLTDB_NAME = "my.db"
BOLTDB_BUCKETNAME = "robotBucket"
BUCKET_CONF = "gen"
)

2
cmd/v2/model/gen.go
View File

@ -8,5 +8,5 @@ type GenTool struct {
InputDir string //输入目录
OutputCodeDir string //输出Code目录
OutputJsonDir string //输出json目录
GenType int32 //生成类型
GenType string //生成类型
}

49
cmd/v2/service/dbServer.go
View File

@ -3,39 +3,72 @@ package service
import (
"encoding/json"
"fmt"
"go_dreamfactory/cmd/v2/lib/common"
"go_dreamfactory/cmd/v2/model"
"log"
"sync"
"time"
"github.com/boltdb/bolt"
"github.com/sirupsen/logrus"
)
type DbService interface {
Create(conf *model.GenTool) error
Save(conf *model.GenTool) error
Update() error
Get() *model.GenTool
}
type DbServiceImpl struct {
}
var dbservice DbService
func NewDbService() DbService {
GetBoltDb()
return &DbServiceImpl{}
dbservice = &DbServiceImpl{}
return dbservice
}
func (this *DbServiceImpl) Create(conf *model.GenTool) error {
func GetDbService() DbService {
return dbservice
}
func (this *DbServiceImpl) Save(conf *model.GenTool) error {
boltDb = GetBoltDb()
defer boltDb.Close()
_ = boltDb.Update(func(tx *bolt.Tx) error {
b, err2 := json.Marshal(conf)
if err2 != nil {
return err
}
return bucket.Put([]byte("gen"), b)
return bucket.Put([]byte(common.BUCKET_CONF), b)
})
return nil
}
func (this *DbServiceImpl) Get() *model.GenTool {
boltDb = GetBoltDb()
defer boltDb.Close()
conf := &model.GenTool{}
if err := boltDb.View(func(tx *bolt.Tx) error {
c := tx.Bucket([]byte(common.BOLTDB_BUCKETNAME))
if c == nil {
return fmt.Errorf("Bucket %s not found!", common.BOLTDB_BUCKETNAME)
}
val := c.Get([]byte(common.BUCKET_CONF))
if err := json.Unmarshal(val, conf); err != nil {
logrus.Errorf("get gen conf err:%v", err)
return err
}
return nil
}); err != nil {
logrus.Errorf("get db conf err: %v", err)
return nil
}
return conf
}
func (this *DbServiceImpl) Update() error {
return nil
}
@ -49,17 +82,17 @@ var (
func GetBoltDb() *bolt.DB {
once.Do(func() {
boltDb, err = bolt.Open("my.db", 0600, &bolt.Options{Timeout: 1 * time.Second})
boltDb, err = bolt.Open(common.BOLTDB_NAME, 0600, &bolt.Options{Timeout: 1 * time.Second})
if err != nil {
log.Fatal(err)
}
boltDb.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte("robotBucket"))
b := tx.Bucket([]byte(common.BOLTDB_BUCKETNAME))
if b != nil {
bucket = b
} else {
bucket, err = tx.CreateBucket([]byte("robotBucket"))
bucket, err = tx.CreateBucket([]byte(common.BOLTDB_BUCKETNAME))
if err != nil {
return fmt.Errorf("create bucket: %s", err)
}

33
cmd/v2/ui/app_gen.go
View File

@ -4,6 +4,8 @@ import (
"errors"
"fmt"
"go_dreamfactory/cmd/v2/lib/common"
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/cmd/v2/service/observer"
"os/exec"
"runtime"
@ -27,6 +29,10 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_GEN, theme.ContentCopyIcon(), nil)
// load
gt := service.GetDbService().Get()
logrus.Debugf("%v", gt)
content := container.NewMax()
content.Objects = []fyne.CanvasObject{}
@ -95,8 +101,23 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
return ""
}
form.SubmitText = "确定"
form.OnSubmit = func() {
saveBtn := widget.NewButtonWithIcon("保存配置", theme.DocumentSaveIcon(), func() {
if err := service.GetDbService().Save(&model.GenTool{
ServerAddr: serverAddr.Text,
ProjectDir: projectDir.Text,
Client: client.Text,
WorkDir: workDir.Text,
InputDir: inputDir.Text,
OutputCodeDir: outputCodeDir.Text,
OutputJsonDir: outputJsonDir.Text,
GenType: genTypeText,
}); err != nil {
logrus.WithField("err", err).Debug("保存配置")
}
logrus.Debug("save gen conf")
})
genBtn := widget.NewButtonWithIcon("生成", theme.ConfirmIcon(), func() {
if runtime.GOOS != "windows" {
dialog.ShowError(errors.New("no support "+runtime.GOOS), toolWin.w)
return
@ -120,15 +141,15 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
)
logrus.Debug(arg)
form.Disable()
defer form.Enable()
c := exec.Command("cmd.exe", "/c", arg)
if err := c.Run(); err != nil {
dialog.ShowError(err, toolWin.w)
return
}
}
content.Objects = append(content.Objects, form)
})
c := container.NewGridWithColumns(2, saveBtn, genBtn)
content.Objects = append(content.Objects, container.NewBorder(form, c, nil, nil))
this.tabItem.Content = content
return nil

4
cmd/v2/ui/protocol.go
View File

@ -406,8 +406,8 @@ var (
Desc: "添加黑名单",
MainType: string(comm.ModuleFriend),
SubType: friend.FriendSubTypeAddBlack,
Req: &pb.FriendBlackAddReq{},
Rsp: &pb.FriendBlackAddResp{},
Req: &pb.FriendAddBlackReq{},
Rsp: &pb.FriendAddBlackResp{},
Enabled: true,
},
ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack): {

2
cmd/v2/ui/views/friend_addblack.go
View File

@ -22,7 +22,7 @@ func (this *FriendAddBlackView) CreateView(t *model.TestCase) fyne.CanvasObject
if err := service.GetPttService().SendToClient(
t.MainType,
t.SubType,
&pb.FriendBlackAddReq{FriendId: friendId.Text},
&pb.FriendAddBlackReq{FriendId: friendId.Text},
); err != nil {
logrus.Error(err)
return

8
modules/friend/api_addblack.go
View File

@ -52,10 +52,10 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR
}
//判断目标是否在好友列表里面
if _, ok := utils.Find(self.FriendIds, req.FriendId); ok {
code = pb.ErrorCode_FriendYet
return
}
// if _, ok := utils.Find(self.FriendIds, req.FriendId); ok {
// code = pb.ErrorCode_FriendYet
// return
// }
//判断目标是否已经在黑名单中
if _, ok := utils.Find(self.BlackIds, req.FriendId); ok {