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

update

Browse Source
This commit is contained in:
meixiongfeng 2023-07-27 18:54:23 +08:00
parent 79bc9c48a2
commit 020c01e9c5
9 changed files with 455 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_battleready.json
View File

@ -523,10 +523,8 @@
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [
"44004"
],
"DefaultHero": 720014,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,

20
bin/json/game_guildbossscore.json
View File

@ -8,7 +8,7 @@
"score": 1,
"rank_low": 0,
"rank_up": 1500000,
"hp": 1,
"hp": 20,
"drop": 10001001,
"grade": "gh_img_a"
},
@ -21,7 +21,7 @@
"score": 1,
"rank_low": 1500001,
"rank_up": 3000000,
"hp": 2,
"hp": 20,
"drop": 10001002,
"grade": "gh_img_b"
},
@ -34,7 +34,7 @@
"score": 1,
"rank_low": 3000001,
"rank_up": 4500000,
"hp": 3,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_c"
},
@ -47,7 +47,7 @@
"score": 1,
"rank_low": 4500001,
"rank_up": 6000000,
"hp": 4,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_d"
},
@ -60,7 +60,7 @@
"score": 1,
"rank_low": 6000001,
"rank_up": 9000000,
"hp": 5,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_e"
},
@ -73,7 +73,7 @@
"score": 1,
"rank_low": 9000001,
"rank_up": 12000000,
"hp": 6,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_ex3"
},
@ -86,7 +86,7 @@
"score": 1,
"rank_low": 12000001,
"rank_up": 15000000,
"hp": 7,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_s"
},
@ -99,7 +99,7 @@
"score": 1,
"rank_low": 15000001,
"rank_up": 18000000,
"hp": 8,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_ss"
},
@ -112,7 +112,7 @@
"score": 1,
"rank_low": 18000001,
"rank_up": 21000000,
"hp": 9,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_sss"
},
@ -125,7 +125,7 @@
"score": 1,
"rank_low": 21000001,
"rank_up": -1,
"hp": 10,
"hp": 20,
"drop": 10001003,
"grade": "gh_img_sss1"
}

80
bin/json/game_item.json
View File

@ -14683,7 +14683,7 @@
{
"id": "10000036",
"name": {
"key": "item_item_name_347",
"key": "item_item_name_369",
"text": "石阵玩法货币"
},
"usetype": 1,
@ -14702,8 +14702,8 @@
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"use_skip": 11001,
"upper_limit": 999,
"img": "item_10000035",
"intr": {
"key": "item_item_intr_378",
@ -14716,5 +14716,79 @@
"n": 1000
}
]
},
{
"id": "10000037",
"name": {
"key": "item_item_name_370",
"text": "石阵天赋树货币"
},
"usetype": 1,
"color": 5,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 999,
"img": "item_10000035",
"intr": {
"key": "item_item_intr_379",
"text": "暂无包装"
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
},
{
"id": "10000038",
"name": {
"key": "item_item_name_371",
"text": "石阵周常积分"
},
"usetype": 1,
"color": 5,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 11001,
"upper_limit": 999,
"img": "item_10000035",
"intr": {
"key": "item_item_intr_380",
"text": "暂无包装"
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
}
]

24
bin/json/game_lottery.json
View File

@ -23494,5 +23494,29 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 980,
"lotteryid": 21141101,
"description": "石阵秘境战斗事件",
"type": 2,
"groupwt": 1000,
"groupid": 10001,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000037",
"n": 1
},
"itemdes": "石阵天赋树货币",
"itemwt": 1000,
"min": 5,
"max": 10,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
}
]

244
bin/json/game_mainstage.json
View File

@ -4195,7 +4195,13 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"firstaward": [
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
@ -4268,7 +4274,9 @@
"chapterid": 11001,
"group_id": 100125,
"previous_group_id": [
100124
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 5,
@ -4324,7 +4332,9 @@
"chapterid": 11001,
"group_id": 100126,
"previous_group_id": [
100125
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -4380,7 +4390,9 @@
"chapterid": 11001,
"group_id": 100127,
"previous_group_id": [
100125
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 5,
@ -4436,7 +4448,9 @@
"chapterid": 11001,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 4,
@ -4516,7 +4530,7 @@
],
"BattleReadyID": 118,
"FormatList": [
101071
103021
],
"star": [
1,
@ -4538,9 +4552,11 @@
{
"id": 1100151,
"chapterid": 11001,
"group_id": 100129,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100150,
"Episodetype": 4,
@ -4619,7 +4635,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103031
],
"star": [
1,
1,
@ -4640,9 +4658,11 @@
{
"id": 1100152,
"chapterid": 11001,
"group_id": 100130,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100151,
"Episodetype": 4,
@ -4721,7 +4741,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103041
],
"star": [
1,
1,
@ -4742,9 +4764,11 @@
{
"id": 1100153,
"chapterid": 11001,
"group_id": 100131,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100152,
"Episodetype": 4,
@ -4823,7 +4847,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103051
],
"star": [
1,
1,
@ -4844,9 +4870,11 @@
{
"id": 1100154,
"chapterid": 11001,
"group_id": 100132,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100153,
"Episodetype": 4,
@ -4925,7 +4953,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103061
],
"star": [
1,
1,
@ -4946,9 +4976,11 @@
{
"id": 1100155,
"chapterid": 11001,
"group_id": 100133,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100154,
"Episodetype": 4,
@ -5027,7 +5059,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103071
],
"star": [
1,
1,
@ -5048,9 +5082,11 @@
{
"id": 1100156,
"chapterid": 11001,
"group_id": 100134,
"group_id": 100128,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 1100155,
"Episodetype": 4,
@ -5129,7 +5165,9 @@
}
],
"BattleReadyID": 119,
"FormatList": [],
"FormatList": [
103081
],
"star": [
1,
1,
@ -5152,7 +5190,9 @@
"chapterid": 11001,
"group_id": 100135,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5169,7 +5209,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5214,7 +5254,9 @@
"chapterid": 11001,
"group_id": 100136,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5231,7 +5273,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5276,7 +5318,9 @@
"chapterid": 11001,
"group_id": 100137,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5293,7 +5337,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5338,7 +5382,9 @@
"chapterid": 11001,
"group_id": 100138,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5400,7 +5446,9 @@
"chapterid": 11001,
"group_id": 100139,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5462,7 +5510,9 @@
"chapterid": 11001,
"group_id": 100140,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5524,7 +5574,9 @@
"chapterid": 11001,
"group_id": 100141,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5586,7 +5638,9 @@
"chapterid": 11001,
"group_id": 100142,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5602,7 +5656,7 @@
"text": "测试节点25"
},
"animation": "",
"hide": 0,
"hide": 1,
"destroy": 0,
"progress": 0,
"frontstoryid": 0,
@ -5648,7 +5702,9 @@
"chapterid": 11001,
"group_id": 100143,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5665,7 +5721,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5710,7 +5766,9 @@
"chapterid": 11001,
"group_id": 100144,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5727,7 +5785,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5772,7 +5830,9 @@
"chapterid": 11001,
"group_id": 100145,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -5789,7 +5849,7 @@
},
"animation": "",
"hide": 0,
"destroy": 0,
"destroy": 1,
"progress": 0,
"frontstoryid": 0,
"afterstoryid": 0,
@ -5834,7 +5894,9 @@
"chapterid": 11001,
"group_id": 100146,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 2,
@ -5890,10 +5952,12 @@
"chapterid": 11001,
"group_id": 100147,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 3,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
@ -5928,17 +5992,65 @@
"text": "测试30"
},
"exp": 0,
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"star": [],
"star_type": [],
"star_value": [],
"hero_exp": 330,
"ps_consume": [
{
"a": "attr",
"t": "ps",
"n": 10
}
],
"ps_mg": [
{
"a": "attr",
"t": "ps",
"n": 1
}
],
"firstaward": [
{
"a": "attr",
"t": "gold",
"n": 6600
},
{
"a": "equi",
"t": "11115",
"n": 1
}
],
"lotteryward": 17111110,
"commonaward": [
{
"a": "attr",
"t": "gold",
"n": 6600
},
{
"a": "equi",
"t": "11125",
"n": 1
}
],
"BattleReadyID": 119,
"FormatList": [
102081
],
"star": [
1,
1,
1
],
"star_type": [
1,
2,
2
],
"star_value": [
0,
2,
1
],
"challengeward": 0
},
{
@ -5946,7 +6058,9 @@
"chapterid": 11001,
"group_id": 100148,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 5,
@ -6002,7 +6116,9 @@
"chapterid": 11001,
"group_id": 100149,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -6018,7 +6134,7 @@
"text": "测试节点32"
},
"animation": "",
"hide": 0,
"hide": 1,
"destroy": 0,
"progress": 0,
"frontstoryid": 0,
@ -6064,7 +6180,9 @@
"chapterid": 11001,
"group_id": 100150,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 7,
@ -6080,7 +6198,7 @@
"text": "测试节点33"
},
"animation": "",
"hide": 0,
"hide": 1,
"destroy": 0,
"progress": 0,
"frontstoryid": 0,
@ -6126,7 +6244,9 @@
"chapterid": 11001,
"group_id": 100151,
"previous_group_id": [
100127
100121,
100122,
100123
],
"previoustage": 0,
"Episodetype": 1,

100
bin/json/game_monsterformat.json
View File

@ -238139,6 +238139,106 @@
"speed": 78,
"modelsize": 1
},
{
"Id": 720014,
"pos": 1,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 25001,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{
"Id": 720014,
"pos": 2,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{
"Id": 720014,
"pos": 3,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{
"Id": 720014,
"pos": 4,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{
"Id": 720014,
"pos": 5,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{
"Id": 800001,
"pos": 1,

50
bin/json/game_trendchose.json
View File

@ -234,5 +234,55 @@
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 11,
"taskstarID": 100110,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_11",
"text": "买乳猪4"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 50020010,
"constory": 50020030,
"get": [
1001
],
"aginstory": 12980,
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 12,
"taskstarID": 100120,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_12",
"text": "买乳猪5"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 50020010,
"constory": 50020030,
"get": [
1001
],
"aginstory": 12980,
"lose": [],
"jump": 0,
"num": 0
}
]

5
modules/stonehenge/api_gotoroom.go
View File

@ -69,6 +69,9 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
}
update["rooms"] = stone.Rooms
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "gotoroom", &pb.StonehengeGotoRoomResp{})
session.SendMsg(string(this.module.GetType()), "gotoroom", &pb.StonehengeGotoRoomResp{
Room: stone.Rooms,
Portal: req.Portal,
})
return
}

6
sys/configure/structs/Game.StoneBuffData.go
View File

@ -17,6 +17,9 @@ type GameStoneBuffData struct {
BuffLevel int32
Quality int32
BuffIcon string
TargetType int32
CampType int32
TakeDataType int32
BuffStory string
BuffUpgradeCost *Gameatn
BuffSell *Gameatn
@ -35,6 +38,9 @@ func (_v *GameStoneBuffData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ { err = errors.New("BuffLevel error"); return }; _v.BuffLevel = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ { err = errors.New("Quality error"); return }; _v.Quality = int32(_tempNum_) }
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ { err = errors.New("BuffIcon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TargetType"].(float64); !_ok_ { err = errors.New("TargetType error"); return }; _v.TargetType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CampType"].(float64); !_ok_ { err = errors.New("CampType error"); return }; _v.CampType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TakeDataType"].(float64); !_ok_ { err = errors.New("TakeDataType error"); return }; _v.TakeDataType = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BuffStory"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffStory error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ { err = errors.New("BuffUpgradeCost error"); return }; if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ { err = errors.New("BuffSell error"); return }; if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil { return } }