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:
liwei 2023-07-04 18:30:35 +08:00
commit eab16c8518
13 changed files with 367 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
bin/json/game_caravancity.json
View File

@ -33,15 +33,14 @@
"citytype": 1, "citytype": 1,
"citytypenum": 2, "citytypenum": 2,
"special": [ "special": [
"1", "21000001",
"2", "21000002",
"4", "21000003",
"6" "21000004"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
"21000002", "21000009"
"21000001"
], ],
"exspecialnum": 1500, "exspecialnum": 1500,
"Orspecial": 1000, "Orspecial": 1000,
@ -51,9 +50,7 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": 1
1
]
}, },
{ {
"id": 102, "id": 102,
@ -89,15 +86,14 @@
"citytype": 1, "citytype": 1,
"citytypenum": 3, "citytypenum": 3,
"special": [ "special": [
"3", "21000001",
"4", "21000002",
"5", "21000003",
"6" "21000007"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
"1", "21000004"
"2"
], ],
"exspecialnum": 1600, "exspecialnum": 1600,
"Orspecial": 1000, "Orspecial": 1000,
@ -107,9 +103,7 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": 1
1
]
}, },
{ {
"id": 103, "id": 103,
@ -146,15 +140,14 @@
"citytype": 1, "citytype": 1,
"citytypenum": 4, "citytypenum": 4,
"special": [ "special": [
"2", "21000001",
"3", "21000002",
"4", "21000003",
"6" "21000004"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
"1", "21000005"
"5"
], ],
"exspecialnum": 1700, "exspecialnum": 1700,
"Orspecial": 1000, "Orspecial": 1000,
@ -164,9 +157,7 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": 1
1
]
}, },
{ {
"id": 104, "id": 104,
@ -203,15 +194,14 @@
"citytype": 1, "citytype": 1,
"citytypenum": 3, "citytypenum": 3,
"special": [ "special": [
"1", "21000001",
"2", "21000002",
"4", "21000003",
"5" "21000004"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
"3", "21000006"
"6"
], ],
"exspecialnum": 1800, "exspecialnum": 1800,
"Orspecial": 1000, "Orspecial": 1000,
@ -221,9 +211,7 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": 1
1
]
}, },
{ {
"id": 105, "id": 105,
@ -259,15 +247,14 @@
"citytype": 1, "citytype": 1,
"citytypenum": 4, "citytypenum": 4,
"special": [ "special": [
"1", "21000001",
"3", "21000002",
"4", "21000003",
"6" "21000009"
], ],
"specialnum": 500, "specialnum": 500,
"exspecial": [ "exspecial": [
"2", "21000007"
"5"
], ],
"exspecialnum": 1900, "exspecialnum": 1900,
"Orspecial": 1000, "Orspecial": 1000,
@ -277,8 +264,6 @@
"sptalk": 11003, "sptalk": 11003,
"buytalk": 11004, "buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": 1
1
]
} }
] ]

63
bin/json/game_caravanthing.json
View File

@ -25,7 +25,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000002", "itemid": "21000002",
@ -53,7 +54,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000003", "itemid": "21000003",
@ -81,7 +83,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000004", "itemid": "21000004",
@ -109,7 +112,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000005", "itemid": "21000005",
@ -137,7 +141,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000006", "itemid": "21000006",
@ -165,7 +170,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000007", "itemid": "21000007",
@ -193,7 +199,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000008", "itemid": "21000008",
@ -221,7 +228,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000009", "itemid": "21000009",
@ -249,7 +257,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000010", "itemid": "21000010",
@ -277,7 +286,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000011", "itemid": "21000011",
@ -305,7 +315,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000012", "itemid": "21000012",
@ -333,7 +344,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000013", "itemid": "21000013",
@ -361,7 +373,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000014", "itemid": "21000014",
@ -389,7 +402,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000015", "itemid": "21000015",
@ -417,7 +431,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000016", "itemid": "21000016",
@ -445,7 +460,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000017", "itemid": "21000017",
@ -473,7 +489,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000018", "itemid": "21000018",
@ -501,7 +518,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000019", "itemid": "21000019",
@ -529,7 +547,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000020", "itemid": "21000020",
@ -557,7 +576,8 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
}, },
{ {
"itemid": "21000021", "itemid": "21000021",
@ -585,6 +605,7 @@
], ],
"FluctuationRange": 500, "FluctuationRange": 500,
"pricemin": 200, "pricemin": 200,
"pricemax": 3000 "pricemax": 3000,
"goodsnum": 80
} }
] ]

2
bin/json/game_hero.json
View File

@ -1472,7 +1472,7 @@
"type": 1, "type": 1,
"ip": 6, "ip": 6,
"sd": 1, "sd": 1,
"handbook": 1, "handbook": -1,
"prefab": "24001", "prefab": "24001",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,

82
bin/json/game_item.json
View File

@ -12685,7 +12685,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_mcs", "img": "icon_mcs",
"intr": { "intr": {
"key": "item_item_intr_356", "key": "item_item_intr_356",
@ -12701,7 +12701,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12716,7 +12716,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "wp_icon_jjcq", "img": "wp_icon_jjcq",
"intr": { "intr": {
"key": "item_item_intr_357", "key": "item_item_intr_357",
@ -12732,7 +12732,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12747,7 +12747,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_358", "key": "item_item_intr_358",
@ -12763,7 +12763,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12778,7 +12778,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_359", "key": "item_item_intr_359",
@ -12794,7 +12794,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12809,7 +12809,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_360", "key": "item_item_intr_360",
@ -12825,7 +12825,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12840,7 +12840,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_361", "key": "item_item_intr_361",
@ -12856,7 +12856,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12871,7 +12871,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_362", "key": "item_item_intr_362",
@ -12887,7 +12887,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12902,7 +12902,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_363", "key": "item_item_intr_363",
@ -12918,7 +12918,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12933,7 +12933,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_364", "key": "item_item_intr_364",
@ -12949,7 +12949,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12964,7 +12964,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_365", "key": "item_item_intr_365",
@ -12980,7 +12980,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -12995,7 +12995,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_366", "key": "item_item_intr_366",
@ -13011,7 +13011,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13026,7 +13026,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_367", "key": "item_item_intr_367",
@ -13042,7 +13042,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13057,7 +13057,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_368", "key": "item_item_intr_368",
@ -13073,7 +13073,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13088,7 +13088,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_369", "key": "item_item_intr_369",
@ -13104,7 +13104,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13119,7 +13119,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_370", "key": "item_item_intr_370",
@ -13135,7 +13135,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13150,7 +13150,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_371", "key": "item_item_intr_371",
@ -13166,7 +13166,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13181,7 +13181,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_372", "key": "item_item_intr_372",
@ -13197,7 +13197,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13212,7 +13212,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_373", "key": "item_item_intr_373",
@ -13228,7 +13228,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13243,7 +13243,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_374", "key": "item_item_intr_374",
@ -13259,7 +13259,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13274,7 +13274,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_375", "key": "item_item_intr_375",
@ -13290,7 +13290,7 @@
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 0,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -13305,7 +13305,7 @@
"decompose_get": [], "decompose_get": [],
"access": [], "access": [],
"use_skip": 11001, "use_skip": 11001,
"upper_limit": 80, "upper_limit": 999,
"img": "icon_st03", "img": "icon_st03",
"intr": { "intr": {
"key": "item_item_intr_376", "key": "item_item_intr_376",

384
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

7
modules/caravan/api_buyorsell.go
View File

@ -178,10 +178,9 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
caravan.Items[k].Price = totla / caravan.Items[k].Count caravan.Items[k].Price = totla / caravan.Items[k].Count
// 同步更新该城市的 出售货物信息 // 同步更新该城市的 出售货物信息
cityInfo.Count[k] += v cityInfo.Count[k] += v
itemConf, err := this.module.configure.GetItemConfigureData(k)
if err == nil { if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存
//if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存 if cityInfo.Count[k] > itemConf.Goodsnum {
if cityInfo.Count[k] > itemConf.UpperLimit {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_TrollBuyMax, // 商品数量不足 Code: pb.ErrorCode_TrollBuyMax, // 商品数量不足
Title: pb.ErrorCode_TrollBuyMax.ToString(), Title: pb.ErrorCode_TrollBuyMax.ToString(),

10
modules/caravan/api_gotocity.go
View File

@ -58,8 +58,14 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
} }
if bNewTask { // 到该城市随机一个新的任务 if bNewTask { // 到该城市随机一个新的任务
if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil { if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil {
ipos := comm.GetRandW(newCity.Cityevent) if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil {
list.Eventid = newCity.Cityevent[ipos] // 新的任务 var randW []int32
for _, v := range elist {
randW = append(randW, v.Eventweight)
}
list.Eventid = elist[comm.GetRandW(randW)].Id
}
// 新的任务
// list.Tasktime = configure.Now().Unix() // list.Tasktime = configure.Now().Unix()
// if event := this.module.configure.GetCaravanEventById(list.Eventid); event != nil { // if event := this.module.configure.GetCaravanEventById(list.Eventid); event != nil {
// list.Task = event.Worldtask // 对应世界任务组 // list.Task = event.Worldtask // 对应世界任务组

48
modules/caravan/comp_configure.go
View File

@ -7,6 +7,7 @@ import (
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"sync"
) )
var moduleName = "caravan" var moduleName = "caravan"
@ -24,6 +25,8 @@ const (
type configureComp struct { type configureComp struct {
modules.MCompConfigure modules.MCompConfigure
module *Caravan module *Caravan
lock sync.RWMutex
event map[int32][]*cfg.GameCaravanEventData
} }
//组件初始化接口 //组件初始化接口
@ -36,6 +39,19 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.LoadConfigure(game_caravan_thing, cfg.NewGameCaravanThing) this.LoadConfigure(game_caravan_thing, cfg.NewGameCaravanThing)
this.LoadConfigure(game_caravan_event, cfg.NewGameCaravanEvent) this.LoadConfigure(game_caravan_event, cfg.NewGameCaravanEvent)
this.LoadConfigure(game_caravan_rank, cfg.NewGameCaravanRank) this.LoadConfigure(game_caravan_rank, cfg.NewGameCaravanRank)
configure.RegisterConfigure(game_caravan_event, cfg.NewGameCaravanRank, func() {
this.lock.Lock()
if v, err := this.GetConfigure(game_caravan_event); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
this.event = make(map[int32][]*cfg.GameCaravanEventData, 0)
for _, v := range v.(*cfg.GameCaravanEvent).GetDataList() {
this.event[v.Eventgroup] = append(this.event[v.Eventgroup], v)
}
}
this.lock.Unlock()
})
return return
} }
@ -139,20 +155,14 @@ func (this *configureComp) GetAllCaravanItem() (data []*cfg.GameCaravanThingData
} }
// 获取随机事件 // 获取随机事件
func (this *configureComp) GetCaravanEventById(id int32) (data *cfg.GameCaravanEventData, err error) { func (this *configureComp) GetCaravanEventByGroup(eventgroup int32) (data []*cfg.GameCaravanEventData, err error) {
var ( var (
v interface{} ok bool
) )
if v, err = this.GetConfigure(game_caravan_event); err == nil { if data, ok = this.event[eventgroup]; !ok {
if configure, ok := v.(*cfg.GameCaravanEvent); ok { err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, eventgroup)
if data = configure.Get(id); data == nil {
err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
this.module.Errorln(err)
}
return
}
} }
err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
return return
} }
@ -214,3 +224,19 @@ func (this *configureComp) GetCaravanRank(index int32) (reward *cfg.GameCaravanR
err = comm.NewNotFoundConfErr(moduleName, game_caravan_rank, index) err = comm.NewNotFoundConfErr(moduleName, game_caravan_rank, index)
return return
} }
func (this *configureComp) GetCaravanEventById(id int32) (data *cfg.GameCaravanEventData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_caravan_event); err == nil {
if configure, ok := v.(*cfg.GameCaravanEvent); ok {
if data = configure.Get(id); data == nil {
err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
this.module.Errorln(err)
}
return
}
}
err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id)
return
}

1
modules/caravan/module.go
View File

@ -224,6 +224,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
// 校验随机事件是否超时 // 校验随机事件是否超时
func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) (bTimeOut bool) { func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) (bTimeOut bool) {
if data.Eventid != 0 { if data.Eventid != 0 {
if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil { if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil {
// 校验任务是否超时 // 校验任务是否超时

12
modules/gm/module.go
View File

@ -149,11 +149,13 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
// 发所有道具 // 发所有道具
item := this.configure.GetAllItemConfigure() item := this.configure.GetAllItemConfigure()
for _, v := range item { for _, v := range item {
res = append(res, &cfg.Gameatn{ if v.Bagtype != 0 {
A: "item", res = append(res, &cfg.Gameatn{
T: v.Id, A: "item",
N: 100, T: v.Id,
}) N: 100,
})
}
} }
errdata = this.DispenseRes(session, res, true) errdata = this.DispenseRes(session, res, true)
if errdata != nil { if errdata != nil {

2
modules/hero/model_hero.go
View File

@ -469,7 +469,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
maxLv = this.module.configure.GetHeroMaxLv(hero.Star) maxLv = this.module.configure.GetHeroMaxLv(hero.Star)
// 校验玩家等级 // 校验玩家等级
if _user := this.module.ModuleUser.GetUser(session.GetUserId()); _user != nil { if _user := this.module.ModuleUser.GetUser(session.GetUserId()); _user != nil {
if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf == nil { if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf != nil {
if maxLv > expConf.HeroLv { if maxLv > expConf.HeroLv {
maxLv = expConf.HeroLv // 英雄最大等级限制 maxLv = expConf.HeroLv // 英雄最大等级限制
} }

17
sys/configure/structs/Game.CaravanCityData.go
View File

@ -34,7 +34,7 @@ type GameCaravanCityData struct {
Sptalk int32 Sptalk int32
Buytalk int32 Buytalk int32
Cityeventpro int32 Cityeventpro int32
Cityevent []int32 Cityevent int32
} }
const TypeId_GameCaravanCityData = 145138895 const TypeId_GameCaravanCityData = 145138895
@ -132,20 +132,7 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sptalk"].(float64); !_ok_ { err = errors.New("sptalk error"); return }; _v.Sptalk = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sptalk"].(float64); !_ok_ { err = errors.New("sptalk error"); return }; _v.Sptalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buytalk"].(float64); !_ok_ { err = errors.New("buytalk error"); return }; _v.Buytalk = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buytalk"].(float64); !_ok_ { err = errors.New("buytalk error"); return }; _v.Buytalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) }
{ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityevent"].(float64); !_ok_ { err = errors.New("cityevent error"); return }; _v.Cityevent = int32(_tempNum_) }
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["cityevent"].([]interface{}); !_ok_ { err = errors.New("cityevent error"); return }
_v.Cityevent = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Cityevent = append(_v.Cityevent, _list_v_)
}
}
return return
} }

2
sys/configure/structs/Game.CaravanThingData.go
View File

@ -21,6 +21,7 @@ type GameCaravanThingData struct {
FluctuationRange int32 FluctuationRange int32
Pricemin int32 Pricemin int32
Pricemax int32 Pricemax int32
Goodsnum int32
} }
const TypeId_GameCaravanThingData = 638455774 const TypeId_GameCaravanThingData = 638455774
@ -105,6 +106,7 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsnum"].(float64); !_ok_ { err = errors.New("goodsnum error"); return }; _v.Goodsnum = int32(_tempNum_) }
return return
} }