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

同步配置

Browse Source
This commit is contained in:
liwei 2023-07-05 18:40:57 +08:00
parent 1290d9c5e3
commit 2eff1f1c9f
9 changed files with 6342 additions and 721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/json/game_battleready.json
View File

@ -476,5 +476,22 @@
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 128,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_dragon_01"
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
}
]

4390
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

920
bin/json/game_favorability.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_gm.json
View File

@ -236,7 +236,7 @@
"key": "GM_GM_text_25",
"text": "跳到主线关卡XX关（填关卡Id）"
},
"data": "1101001",
"data": "1101201",
"prefix": "bingo:mainline,{0}"
},
{
@ -256,7 +256,7 @@
"key": "GM_GM_text_28",
"text": "跳到世界任务XX任务（分组,任务id）"
},
"data": "1,10100",
"data": "10,20220",
"prefix": "bingo:worldtask,{0}"
},
{

1682
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

2
modules/items/modelitems.go
View File

@ -433,7 +433,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
if leftnum > 0 { //还没有放完 寻找空的格子填充
index := int32(len(items))
for leftnum > 0 { //需要补充格子
if conf.UpperLimit == -1 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
if conf.UpperLimit == 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
grid := &pb.DB_UserItemData{
GridId: primitive.NewObjectID().Hex(),
UId: uid,

2
modules/wtask/modelWTask.go
View File

@ -40,7 +40,7 @@ func (this *ModelWTask) getUserWTasks(uid string) (results *pb.DBWTask, err erro
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Activations: make([]int32, 0),
Accepttask: make([]int32, 0),
Accepts: make([]int32, 0),
Completes: make([]int32, 0),
}
err = this.Add(uid, results)

30
pb/wtask_msg.pb.go
View File

@ -576,9 +576,7 @@ type WTaskAcceptChangePush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
Accepts []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"` //已接取任务列表
Completes []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"` //完成任务列表
}
func (x *WTaskAcceptChangePush) Reset() {
@ -613,13 +611,6 @@ func (*WTaskAcceptChangePush) Descriptor() ([]byte, []int) {
return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11}
}
func (x *WTaskAcceptChangePush) GetActivations() []int32 {
if x != nil {
return x.Activations
}
return nil
}
func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
if x != nil {
return x.Accepts
@ -627,13 +618,6 @@ func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
return nil
}
func (x *WTaskAcceptChangePush) GetCompletes() []int32 {
if x != nil {
return x.Completes
}
return nil
}
var File_wtask_wtask_msg_proto protoreflect.FileDescriptor
var file_wtask_wtask_msg_proto_rawDesc = []byte{
@ -684,15 +668,11 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
0x6e, 0x73, 0x22, 0x7f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61,
0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a,
0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63,
0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
0x74, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x6e, 0x73, 0x22, 0x3f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x07, 0x61,
0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63, 0x63, 0x65,
0x70, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}