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:
meixiongfeng 2022-11-22 14:39:41 +08:00
commit d1569a77d5
10 changed files with 398 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
bin/json/game_item.json
View File

@ -37,6 +37,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10001", "key": "itemtipstxt_10001",
"text": "初级经验精灵不足" "text": "初级经验精灵不足"
@ -80,6 +81,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10002", "key": "itemtipstxt_10002",
"text": "石头不足" "text": "石头不足"
@ -123,6 +125,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10003", "key": "itemtipstxt_10003",
"text": "5星阿宝碎片不足" "text": "5星阿宝碎片不足"
@ -166,6 +169,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10004", "key": "itemtipstxt_10004",
"text": "金币自选箱不足" "text": "金币自选箱不足"
@ -209,6 +213,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10005", "key": "itemtipstxt_10005",
"text": "随机金币箱子不足" "text": "随机金币箱子不足"
@ -252,6 +257,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10006", "key": "itemtipstxt_10006",
"text": "金币箱子不足" "text": "金币箱子不足"
@ -295,6 +301,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10007", "key": "itemtipstxt_10007",
"text": "2小时金币不足" "text": "2小时金币不足"
@ -338,6 +345,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10008", "key": "itemtipstxt_10008",
"text": "特殊2小时金币不足" "text": "特殊2小时金币不足"
@ -381,6 +389,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10009", "key": "itemtipstxt_10009",
"text": "被封印的魔法书不足" "text": "被封印的魔法书不足"
@ -424,6 +433,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10010", "key": "itemtipstxt_10010",
"text": "古代硬币不足" "text": "古代硬币不足"
@ -467,6 +477,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10011", "key": "itemtipstxt_10011",
"text": "坏掉的钟表不足" "text": "坏掉的钟表不足"
@ -510,6 +521,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10012", "key": "itemtipstxt_10012",
"text": "木材不足" "text": "木材不足"
@ -553,6 +565,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10013", "key": "itemtipstxt_10013",
"text": "四叶草不足" "text": "四叶草不足"
@ -596,6 +609,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10014", "key": "itemtipstxt_10014",
"text": "冒险家勋章不足" "text": "冒险家勋章不足"
@ -639,6 +653,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10015", "key": "itemtipstxt_10015",
"text": "猫猫护身符不足" "text": "猫猫护身符不足"
@ -682,6 +697,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_10016", "key": "itemtipstxt_10016",
"text": "人造钻石不足" "text": "人造钻石不足"
@ -725,6 +741,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_20001", "key": "itemtipstxt_20001",
"text": "随机英雄碎片不足" "text": "随机英雄碎片不足"
@ -768,6 +785,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_20002", "key": "itemtipstxt_20002",
"text": "25001号碎片不足" "text": "25001号碎片不足"
@ -805,6 +823,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_30001", "key": "itemtipstxt_30001",
"text": "时空石不足" "text": "时空石不足"
@ -842,6 +861,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_30002", "key": "itemtipstxt_30002",
"text": "奥术石不足" "text": "奥术石不足"
@ -879,6 +899,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_30003", "key": "itemtipstxt_30003",
"text": "科技石不足" "text": "科技石不足"
@ -916,6 +937,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_30004", "key": "itemtipstxt_30004",
"text": "自然石不足" "text": "自然石不足"
@ -953,6 +975,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_30005", "key": "itemtipstxt_30005",
"text": "光耀石不足" "text": "光耀石不足"
@ -1002,6 +1025,7 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50001", "key": "itemtipstxt_50001",
"text": "奥术美食-低级不足" "text": "奥术美食-低级不足"
@ -1051,6 +1075,7 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50002", "key": "itemtipstxt_50002",
"text": "科技美食-低级不足" "text": "科技美食-低级不足"
@ -1100,6 +1125,7 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50003", "key": "itemtipstxt_50003",
"text": "自然美食-低级不足" "text": "自然美食-低级不足"
@ -1149,6 +1175,7 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50004", "key": "itemtipstxt_50004",
"text": "光耀美食-低级不足" "text": "光耀美食-低级不足"
@ -1198,6 +1225,13 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50005", "key": "itemtipstxt_50005",
"text": "奥术美食-中级不足" "text": "奥术美食-中级不足"
@ -1247,6 +1281,13 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50006", "key": "itemtipstxt_50006",
"text": "科技美食-中级不足" "text": "科技美食-中级不足"
@ -1296,6 +1337,13 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50007", "key": "itemtipstxt_50007",
"text": "自然美食-中级不足" "text": "自然美食-中级不足"
@ -1345,6 +1393,13 @@
"n": 1000 "n": 1000
} }
], ],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50008", "key": "itemtipstxt_50008",
"text": "光耀美食-中级不足" "text": "光耀美食-中级不足"
@ -1388,6 +1443,13 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50009", "key": "itemtipstxt_50009",
"text": "奥术美食-高级不足" "text": "奥术美食-高级不足"
@ -1431,6 +1493,13 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50010", "key": "itemtipstxt_50010",
"text": "科技美食-高级不足" "text": "科技美食-高级不足"
@ -1474,6 +1543,13 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50011", "key": "itemtipstxt_50011",
"text": "自然美食-高级不足" "text": "自然美食-高级不足"
@ -1517,6 +1593,13 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_50012", "key": "itemtipstxt_50012",
"text": "光耀美食-高级不足" "text": "光耀美食-高级不足"
@ -1554,6 +1637,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_60001", "key": "itemtipstxt_60001",
"text": "5星装备自选箱不足" "text": "5星装备自选箱不足"
@ -1591,6 +1675,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_60002", "key": "itemtipstxt_60002",
"text": "5星装备随机箱不足" "text": "5星装备随机箱不足"
@ -1628,6 +1713,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_60003", "key": "itemtipstxt_60003",
"text": "5星套装宝箱不足" "text": "5星套装宝箱不足"
@ -1671,6 +1757,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_90001", "key": "itemtipstxt_90001",
"text": "阿宝的天赋点不足" "text": "阿宝的天赋点不足"
@ -1714,6 +1801,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_90002", "key": "itemtipstxt_90002",
"text": "波比的天赋点不足" "text": "波比的天赋点不足"
@ -1757,6 +1845,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_90003", "key": "itemtipstxt_90003",
"text": "小伊的天赋点不足" "text": "小伊的天赋点不足"
@ -1800,6 +1889,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40001", "key": "itemtipstxt_40001",
"text": "攻势附魔石不足" "text": "攻势附魔石不足"
@ -1843,6 +1933,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40002", "key": "itemtipstxt_40002",
"text": "逐风附魔石不足" "text": "逐风附魔石不足"
@ -1886,6 +1977,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40003", "key": "itemtipstxt_40003",
"text": "寒霜附魔石不足" "text": "寒霜附魔石不足"
@ -1929,6 +2021,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40004", "key": "itemtipstxt_40004",
"text": "牧神附魔石不足" "text": "牧神附魔石不足"
@ -1972,6 +2065,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40005", "key": "itemtipstxt_40005",
"text": "玄武附魔石不足" "text": "玄武附魔石不足"
@ -2015,6 +2109,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40006", "key": "itemtipstxt_40006",
"text": "箭神附魔石不足" "text": "箭神附魔石不足"
@ -2058,6 +2153,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40007", "key": "itemtipstxt_40007",
"text": "渴血附魔石不足" "text": "渴血附魔石不足"
@ -2101,6 +2197,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40008", "key": "itemtipstxt_40008",
"text": "愈合附魔石不足" "text": "愈合附魔石不足"
@ -2144,6 +2241,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40009", "key": "itemtipstxt_40009",
"text": "祈愿附魔石不足" "text": "祈愿附魔石不足"
@ -2187,6 +2285,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40010", "key": "itemtipstxt_40010",
"text": "预言附魔石不足" "text": "预言附魔石不足"
@ -2230,6 +2329,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40011", "key": "itemtipstxt_40011",
"text": "月盾附魔石不足" "text": "月盾附魔石不足"
@ -2273,6 +2373,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40012", "key": "itemtipstxt_40012",
"text": "破妄附魔石不足" "text": "破妄附魔石不足"
@ -2316,6 +2417,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40013", "key": "itemtipstxt_40013",
"text": "脉冲附魔石不足" "text": "脉冲附魔石不足"
@ -2359,6 +2461,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40014", "key": "itemtipstxt_40014",
"text": "裁决附魔石不足" "text": "裁决附魔石不足"
@ -2402,6 +2505,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40015", "key": "itemtipstxt_40015",
"text": "炼心附魔石不足" "text": "炼心附魔石不足"
@ -2445,6 +2549,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40016", "key": "itemtipstxt_40016",
"text": "诅咒附魔石不足" "text": "诅咒附魔石不足"
@ -2488,6 +2593,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40017", "key": "itemtipstxt_40017",
"text": "守护附魔石不足" "text": "守护附魔石不足"
@ -2531,6 +2637,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40018", "key": "itemtipstxt_40018",
"text": "御免附魔石不足" "text": "御免附魔石不足"
@ -2574,6 +2681,7 @@
} }
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_40019", "key": "itemtipstxt_40019",
"text": "庇佑附魔石不足" "text": "庇佑附魔石不足"
@ -2611,6 +2719,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_100001", "key": "itemtipstxt_100001",
"text": "维京远征挑战券不足" "text": "维京远征挑战券不足"
@ -2648,6 +2757,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_100002", "key": "itemtipstxt_100002",
"text": "狩猎挑战券不足" "text": "狩猎挑战券不足"
@ -2685,6 +2795,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_100003", "key": "itemtipstxt_100003",
"text": "秘境挑战券不足" "text": "秘境挑战券不足"
@ -2722,6 +2833,7 @@
}, },
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [],
"tipstxt": { "tipstxt": {
"key": "itemtipstxt_100004", "key": "itemtipstxt_100004",
"text": "竞技场挑战券不足" "text": "竞技场挑战券不足"

2
modules/equipment/api_ench.go
View File

@ -91,7 +91,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
return return
} }
} }
this.module.ModuleRtask.SendToRtask(session, comm.Rtype94, 1)
session.SendMsg(string(this.module.GetType()), "ench", &pb.EquipmentEnchResp{Issucc: true, Equipment: equip}) session.SendMsg(string(this.module.GetType()), "ench", &pb.EquipmentEnchResp{Issucc: true, Equipment: equip})
return return
} }

1
modules/equipment/api_forg.go
View File

@ -65,7 +65,6 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (
N: int32(v), N: int32(v),
}) })
} }
session.SendMsg(string(this.module.GetType()), "forg", &pb.EquipmentForgResp{Issucc: true, Reward: reward}) session.SendMsg(string(this.module.GetType()), "forg", &pb.EquipmentForgResp{Issucc: true, Reward: reward})
return return
} }

2
modules/equipment/api_upgrade.go
View File

@ -192,6 +192,8 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
} else { } else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId()) this.module.Errorf("no found userdata uid:%s", session.GetUserId())
} }
} else {
this.module.ModuleRtask.SendToRtask(session, comm.Rtype96, 1)
} }
session.SendMsg(string(this.module.GetType()), "upgrade", &pb.EquipmentUpgradeResp{IsSucc: issucc, Equipment: modifyequipments}) session.SendMsg(string(this.module.GetType()), "upgrade", &pb.EquipmentUpgradeResp{IsSucc: issucc, Equipment: modifyequipments})
return return

2
modules/equipment/api_wash.go
View File

@ -66,7 +66,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)), Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)),
} }
} }
this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1)
session.SendMsg(string(this.module.GetType()), "wash", &pb.EquipmentWashResp{Eid: req.Eid, AdverbEntry: adverbEntry}) session.SendMsg(string(this.module.GetType()), "wash", &pb.EquipmentWashResp{Eid: req.Eid, AdverbEntry: adverbEntry})
return return
} }

78
modules/items/api_decompose.go Normal file
View File

@ -0,0 +1,78 @@
package items
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) {
if req.GridId == "" || req.Amount <= 0 {
code = pb.ErrorCode_ReqParameterError
}
return
}
//出售道具
func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data proto.Message) {
var (
err error
item *pb.DB_UserItemData
itemcf *cfg.GameItemData
sale []*cfg.Gameatn
)
if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success {
return
}
if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil {
code = pb.ErrorCode_ReqParameterError
return
}
if itemcf, err = this.module.configure.GetItemConfigure(item.ItemId); err != nil {
code = pb.ErrorCode_ConfigurationException
return
}
if itemcf.Sale == nil || len(itemcf.Sale) == 0 {
code = pb.ErrorCode_ItemsUseNoCanSell
return
}
if itemcf.DecomposeDeplete == nil || len(itemcf.DecomposeDeplete) == 0 {
code = pb.ErrorCode_ItemsUseNoCanSell
return
}
sale = make([]*cfg.Gameatn, 0, len(itemcf.DecomposeDeplete))
for _, v := range itemcf.DecomposeDeplete {
sale = append(sale, &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N * int32(req.Amount),
})
}
if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success {
return
}
if req.Amount > item.Amount {
code = pb.ErrorCode_ReqParameterError
this.module.Errorf("SellItemCheck over all amount:[%d:%d]", req.Amount, item.Amount)
return
}
sale = make([]*cfg.Gameatn, len(itemcf.Sale))
for i, v := range itemcf.Sale {
temp := *v
sale[i] = &temp
sale[i].N = v.N * int32(req.Amount)
}
if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success {
return
}
item.Amount = item.Amount - req.Amount
if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success {
return
}
session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true})
return
}

17
modules/items/api_sellItem.go
View File

@ -9,7 +9,7 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) { func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode) {
if req.GridId == "" || req.Amount <= 0 { if req.GridId == "" || req.Amount <= 0 {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
} }
@ -17,14 +17,14 @@ func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellI
} }
//出售道具 //出售道具
func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data proto.Message) { func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data proto.Message) {
var ( var (
err error err error
item *pb.DB_UserItemData item *pb.DB_UserItemData
itemcf *cfg.GameItemData itemcf *cfg.GameItemData
sale []*cfg.Gameatn sale []*cfg.Gameatn
) )
if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { if code = this.DecomposeCheck(session, req); code != pb.ErrorCode_Success {
return return
} }
if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil { if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil {
@ -57,17 +57,6 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe
if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success {
return return
} }
// if item.Amount == 0 {
// if err = this.module.modelItems.DelUserPack(session.GetUserId(), item.GridId); err != nil {
// code = pb.ErrorCode_DBError
// return
// }
// } else {
// if err = this.module.modelItems.UpdateUserPack(session.GetUserId(), item); err != nil {
// code = pb.ErrorCode_DBError
// return
// }
// }
session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true}) session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true})
return return
} }

149
pb/friend_msg.pb.go
View File

@ -2008,109 +2008,6 @@ func (x *FriendAssistHeroListResp) GetFriends() []*FriendBase {
return nil return nil
} }
// 查询是否已申请目标玩家为好友或目标玩家是否已是好友
type FriendGetRelationReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` //目标玩家ID
}
func (x *FriendGetRelationReq) Reset() {
*x = FriendGetRelationReq{}
if protoimpl.UnsafeEnabled {
mi := &file_friend_friend_msg_proto_msgTypes[40]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *FriendGetRelationReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*FriendGetRelationReq) ProtoMessage() {}
func (x *FriendGetRelationReq) ProtoReflect() protoreflect.Message {
mi := &file_friend_friend_msg_proto_msgTypes[40]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use FriendGetRelationReq.ProtoReflect.Descriptor instead.
func (*FriendGetRelationReq) Descriptor() ([]byte, []int) {
return file_friend_friend_msg_proto_rawDescGZIP(), []int{40}
}
func (x *FriendGetRelationReq) GetTargetUid() string {
if x != nil {
return x.TargetUid
}
return ""
}
type FriendGetRelationResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"`
Status bool `protobuf:"varint,2,opt,name=status,proto3" json:"status"` //已是好友或已申请返回true
}
func (x *FriendGetRelationResp) Reset() {
*x = FriendGetRelationResp{}
if protoimpl.UnsafeEnabled {
mi := &file_friend_friend_msg_proto_msgTypes[41]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *FriendGetRelationResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*FriendGetRelationResp) ProtoMessage() {}
func (x *FriendGetRelationResp) ProtoReflect() protoreflect.Message {
mi := &file_friend_friend_msg_proto_msgTypes[41]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use FriendGetRelationResp.ProtoReflect.Descriptor instead.
func (*FriendGetRelationResp) Descriptor() ([]byte, []int) {
return file_friend_friend_msg_proto_rawDescGZIP(), []int{41}
}
func (x *FriendGetRelationResp) GetTargetUid() string {
if x != nil {
return x.TargetUid
}
return ""
}
func (x *FriendGetRelationResp) GetStatus() bool {
if x != nil {
return x.Status
}
return false
}
var File_friend_friend_msg_proto protoreflect.FileDescriptor var File_friend_friend_msg_proto protoreflect.FileDescriptor
var file_friend_friend_msg_proto_rawDesc = []byte{ var file_friend_friend_msg_proto_rawDesc = []byte{
@ -2262,16 +2159,8 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07,
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x74, 0x6f, 0x33,
0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x15, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64,
0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -2286,7 +2175,7 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
return file_friend_friend_msg_proto_rawDescData return file_friend_friend_msg_proto_rawDescData
} }
var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 42) var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
var file_friend_friend_msg_proto_goTypes = []interface{}{ var file_friend_friend_msg_proto_goTypes = []interface{}{
(*FriendBase)(nil), // 0: FriendBase (*FriendBase)(nil), // 0: FriendBase
(*FriendListReq)(nil), // 1: FriendListReq (*FriendListReq)(nil), // 1: FriendListReq
@ -2328,9 +2217,7 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
(*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush (*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush
(*FriendAssistHeroListReq)(nil), // 38: FriendAssistHeroListReq (*FriendAssistHeroListReq)(nil), // 38: FriendAssistHeroListReq
(*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp (*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp
(*FriendGetRelationReq)(nil), // 40: FriendGetRelationReq (*AssistRecord)(nil), // 40: AssistRecord
(*FriendGetRelationResp)(nil), // 41: FriendGetRelationResp
(*AssistRecord)(nil), // 42: AssistRecord
} }
var file_friend_friend_msg_proto_depIdxs = []int32{ var file_friend_friend_msg_proto_depIdxs = []int32{
0, // 0: FriendListResp.list:type_name -> FriendBase 0, // 0: FriendListResp.list:type_name -> FriendBase
@ -2340,7 +2227,7 @@ var file_friend_friend_msg_proto_depIdxs = []int32{
0, // 4: FriendBlackListResp.friends:type_name -> FriendBase 0, // 4: FriendBlackListResp.friends:type_name -> FriendBase
0, // 5: FriendZanlistResp.list:type_name -> FriendBase 0, // 5: FriendZanlistResp.list:type_name -> FriendBase
0, // 6: FriendAssistlistResp.list:type_name -> FriendBase 0, // 6: FriendAssistlistResp.list:type_name -> FriendBase
42, // 7: FriendAssistlistResp.record:type_name -> AssistRecord 40, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
0, // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase 0, // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
0, // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase 0, // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase
10, // [10:10] is the sub-list for method output_type 10, // [10:10] is the sub-list for method output_type
@ -2837,30 +2724,6 @@ func file_friend_friend_msg_proto_init() {
return nil return nil
} }
} }
file_friend_friend_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*FriendGetRelationReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_friend_friend_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*FriendGetRelationResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -2868,7 +2731,7 @@ func file_friend_friend_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_friend_friend_msg_proto_rawDesc, RawDescriptor: file_friend_friend_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 42, NumMessages: 40,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

180
pb/items_msg.pb.go
View File

@ -420,6 +420,134 @@ func (x *ItemsSellItemResp) GetIssucc() bool {
return false return false
} }
//分解道具 请求
type ItemsDecomposeReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId"` //格子Id
ItemId string `protobuf:"bytes,2,opt,name=ItemId,proto3" json:"ItemId"` //物品Id
Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量
}
func (x *ItemsDecomposeReq) Reset() {
*x = ItemsDecomposeReq{}
if protoimpl.UnsafeEnabled {
mi := &file_items_items_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ItemsDecomposeReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ItemsDecomposeReq) ProtoMessage() {}
func (x *ItemsDecomposeReq) ProtoReflect() protoreflect.Message {
mi := &file_items_items_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ItemsDecomposeReq.ProtoReflect.Descriptor instead.
func (*ItemsDecomposeReq) Descriptor() ([]byte, []int) {
return file_items_items_msg_proto_rawDescGZIP(), []int{7}
}
func (x *ItemsDecomposeReq) GetGridId() string {
if x != nil {
return x.GridId
}
return ""
}
func (x *ItemsDecomposeReq) GetItemId() string {
if x != nil {
return x.ItemId
}
return ""
}
func (x *ItemsDecomposeReq) GetAmount() uint32 {
if x != nil {
return x.Amount
}
return 0
}
//分解道具 请求回应
type ItemsDecomposeResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId"` //格子Id
Amount uint32 `protobuf:"varint,2,opt,name=Amount,proto3" json:"Amount"` //使用数量
Issucc bool `protobuf:"varint,3,opt,name=issucc,proto3" json:"issucc"` //是否成功
}
func (x *ItemsDecomposeResp) Reset() {
*x = ItemsDecomposeResp{}
if protoimpl.UnsafeEnabled {
mi := &file_items_items_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ItemsDecomposeResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ItemsDecomposeResp) ProtoMessage() {}
func (x *ItemsDecomposeResp) ProtoReflect() protoreflect.Message {
mi := &file_items_items_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ItemsDecomposeResp.ProtoReflect.Descriptor instead.
func (*ItemsDecomposeResp) Descriptor() ([]byte, []int) {
return file_items_items_msg_proto_rawDescGZIP(), []int{8}
}
func (x *ItemsDecomposeResp) GetGridId() string {
if x != nil {
return x.GridId
}
return ""
}
func (x *ItemsDecomposeResp) GetAmount() uint32 {
if x != nil {
return x.Amount
}
return 0
}
func (x *ItemsDecomposeResp) GetIssucc() bool {
if x != nil {
return x.Issucc
}
return false
}
var File_items_items_msg_proto protoreflect.FileDescriptor var File_items_items_msg_proto protoreflect.FileDescriptor
var file_items_items_msg_proto_rawDesc = []byte{ var file_items_items_msg_proto_rawDesc = []byte{
@ -458,8 +586,20 @@ var file_items_items_msg_proto_rawDesc = []byte{
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a,
0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41,
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18,
0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5b, 0x0a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x44, 0x65, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x52,
0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74,
0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d,
0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5c, 0x0a, 0x12, 0x49, 0x74,
0x65, 0x6d, 0x73, 0x44, 0x65, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70,
0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -474,7 +614,7 @@ func file_items_items_msg_proto_rawDescGZIP() []byte {
return file_items_items_msg_proto_rawDescData return file_items_items_msg_proto_rawDescData
} }
var file_items_items_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_items_items_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_items_items_msg_proto_goTypes = []interface{}{ var file_items_items_msg_proto_goTypes = []interface{}{
(*ItemsGetlistReq)(nil), // 0: ItemsGetlistReq (*ItemsGetlistReq)(nil), // 0: ItemsGetlistReq
(*ItemsGetlistResp)(nil), // 1: ItemsGetlistResp (*ItemsGetlistResp)(nil), // 1: ItemsGetlistResp
@ -483,11 +623,13 @@ var file_items_items_msg_proto_goTypes = []interface{}{
(*ItemsUseItemResp)(nil), // 4: ItemsUseItemResp (*ItemsUseItemResp)(nil), // 4: ItemsUseItemResp
(*ItemsSellItemReq)(nil), // 5: ItemsSellItemReq (*ItemsSellItemReq)(nil), // 5: ItemsSellItemReq
(*ItemsSellItemResp)(nil), // 6: ItemsSellItemResp (*ItemsSellItemResp)(nil), // 6: ItemsSellItemResp
(*DB_UserItemData)(nil), // 7: DB_UserItemData (*ItemsDecomposeReq)(nil), // 7: ItemsDecomposeReq
(*ItemsDecomposeResp)(nil), // 8: ItemsDecomposeResp
(*DB_UserItemData)(nil), // 9: DB_UserItemData
} }
var file_items_items_msg_proto_depIdxs = []int32{ var file_items_items_msg_proto_depIdxs = []int32{
7, // 0: ItemsGetlistResp.Grids:type_name -> DB_UserItemData 9, // 0: ItemsGetlistResp.Grids:type_name -> DB_UserItemData
7, // 1: ItemsChangePush.Grids:type_name -> DB_UserItemData 9, // 1: ItemsChangePush.Grids:type_name -> DB_UserItemData
2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method output_type
2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for method input_type
2, // [2:2] is the sub-list for extension type_name 2, // [2:2] is the sub-list for extension type_name
@ -586,6 +728,30 @@ func file_items_items_msg_proto_init() {
return nil return nil
} }
} }
file_items_items_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ItemsDecomposeReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_items_items_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ItemsDecomposeResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -593,7 +759,7 @@ func file_items_items_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_items_items_msg_proto_rawDesc, RawDescriptor: file_items_items_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 7, NumMessages: 9,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

15
sys/configure/structs/game.itemData.go
View File

@ -34,6 +34,7 @@ type GameItemData struct {
Intr string Intr string
Sale []*Gameatn Sale []*Gameatn
SynthetizeDeplete []*Gameatn SynthetizeDeplete []*Gameatn
DecomposeDeplete []*Gameatn
Tipstxt string Tipstxt string
} }
@ -106,6 +107,20 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
} }
} }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["decompose_deplete"].([]interface{}); !_ok_ { err = errors.New("decompose_deplete error"); return }
_v.DecomposeDeplete = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.DecomposeDeplete = append(_v.DecomposeDeplete, _list_v_)
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return return
} }