Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
This commit is contained in:
liwei1dao
commit
27a6f9d7f0
@ -88,5 +88,215 @@
|
||||
"id": 10015,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 16,
|
||||
"id": 10016,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 17,
|
||||
"id": 10017,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 18,
|
||||
"id": 10018,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 19,
|
||||
"id": 10019,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 20,
|
||||
"id": 10020,
|
||||
"type_id": 1,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 21,
|
||||
"id": 10001,
|
||||
"type_id": 2,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 22,
|
||||
"id": 10002,
|
||||
"type_id": 2,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 23,
|
||||
"id": 10001,
|
||||
"type_id": 11,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 24,
|
||||
"id": 10002,
|
||||
"type_id": 11,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 25,
|
||||
"id": 10003,
|
||||
"type_id": 11,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 26,
|
||||
"id": 10004,
|
||||
"type_id": 11,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 27,
|
||||
"id": 10005,
|
||||
"type_id": 11,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 28,
|
||||
"id": 10001,
|
||||
"type_id": 12,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 29,
|
||||
"id": 10002,
|
||||
"type_id": 12,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 30,
|
||||
"id": 10006,
|
||||
"type_id": 21,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 31,
|
||||
"id": 10007,
|
||||
"type_id": 21,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 32,
|
||||
"id": 10008,
|
||||
"type_id": 21,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 33,
|
||||
"id": 10009,
|
||||
"type_id": 21,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 34,
|
||||
"id": 10010,
|
||||
"type_id": 21,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 35,
|
||||
"id": 10006,
|
||||
"type_id": 22,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 36,
|
||||
"id": 10007,
|
||||
"type_id": 22,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 37,
|
||||
"id": 100011,
|
||||
"type_id": 31,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 38,
|
||||
"id": 100012,
|
||||
"type_id": 31,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 39,
|
||||
"id": 100013,
|
||||
"type_id": 31,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 40,
|
||||
"id": 100014,
|
||||
"type_id": 31,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 41,
|
||||
"id": 100015,
|
||||
"type_id": 31,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 42,
|
||||
"id": 100011,
|
||||
"type_id": 32,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 43,
|
||||
"id": 100012,
|
||||
"type_id": 32,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 44,
|
||||
"id": 100016,
|
||||
"type_id": 41,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 45,
|
||||
"id": 100017,
|
||||
"type_id": 41,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 46,
|
||||
"id": 100018,
|
||||
"type_id": 41,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 47,
|
||||
"id": 100019,
|
||||
"type_id": 41,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 48,
|
||||
"id": 100020,
|
||||
"type_id": 41,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 49,
|
||||
"id": 100016,
|
||||
"type_id": 42,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 50,
|
||||
"id": 100017,
|
||||
"type_id": 42,
|
||||
"weight": 1000
|
||||
}
|
||||
]
|
||||
18
bin/json/game_drawcom.json
Normal file
18
bin/json/game_drawcom.json
Normal file
@ -0,0 +1,18 @@
|
||||
[
|
||||
{
|
||||
"key": "star3_click",
|
||||
"value": 2
|
||||
},
|
||||
{
|
||||
"key": "star4_click",
|
||||
"value": 4
|
||||
},
|
||||
{
|
||||
"key": "star5_click",
|
||||
"value": 6
|
||||
},
|
||||
{
|
||||
"key": "progress_bar_time",
|
||||
"value": 10
|
||||
}
|
||||
]
|
||||
132
bin/json/game_drawcost.json
Normal file
132
bin/json/game_drawcost.json
Normal file
@ -0,0 +1,132 @@
|
||||
[
|
||||
{
|
||||
"key": 1,
|
||||
"count": 1,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10001",
|
||||
"n": 1
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 2,
|
||||
"count": 10,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10001",
|
||||
"n": 10
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 3,
|
||||
"count": 1,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10002",
|
||||
"n": 1
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 4,
|
||||
"count": 10,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10002",
|
||||
"n": 10
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 5,
|
||||
"count": 1,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10003",
|
||||
"n": 1
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 6,
|
||||
"count": 10,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10003",
|
||||
"n": 10
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 7,
|
||||
"count": 1,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10004",
|
||||
"n": 1
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 8,
|
||||
"count": 10,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10004",
|
||||
"n": 10
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 9,
|
||||
"count": 1,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10005",
|
||||
"n": 1
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
},
|
||||
{
|
||||
"key": 10,
|
||||
"count": 10,
|
||||
"cost": {
|
||||
"a": "item",
|
||||
"t": "10005",
|
||||
"n": 10
|
||||
},
|
||||
"floor4": 50,
|
||||
"floor5": 100,
|
||||
"floor4cards": 2,
|
||||
"floor5cards": 11
|
||||
}
|
||||
]
|
||||
@ -1,9 +1,20 @@
|
||||
[
|
||||
{
|
||||
"key": 1,
|
||||
"time": 20220715,
|
||||
"duration": 14,
|
||||
"up_hero": 10001,
|
||||
"up_weight": 10000
|
||||
"time_on": 934041600,
|
||||
"time_off": 935251200,
|
||||
"up_hero": [
|
||||
10001,
|
||||
10002
|
||||
],
|
||||
"up_weight": [
|
||||
5000,
|
||||
5000
|
||||
],
|
||||
"trigger_num": 50,
|
||||
"Increase_weight": [
|
||||
100,
|
||||
100
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -16,7 +16,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10002,
|
||||
@ -35,7 +36,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10003,
|
||||
@ -56,7 +58,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10004,
|
||||
@ -75,7 +78,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10005,
|
||||
@ -96,7 +100,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10006,
|
||||
@ -115,7 +120,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10011,
|
||||
@ -134,7 +140,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10012,
|
||||
@ -153,7 +160,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10013,
|
||||
@ -174,7 +182,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10014,
|
||||
@ -193,7 +202,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10015,
|
||||
@ -214,7 +224,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10016,
|
||||
@ -233,7 +244,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10021,
|
||||
@ -252,7 +264,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10022,
|
||||
@ -271,7 +284,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10023,
|
||||
@ -292,7 +306,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10024,
|
||||
@ -311,7 +326,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10025,
|
||||
@ -332,7 +348,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10026,
|
||||
@ -351,7 +368,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10031,
|
||||
@ -370,7 +388,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10032,
|
||||
@ -389,7 +408,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10033,
|
||||
@ -410,7 +430,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10034,
|
||||
@ -429,7 +450,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10035,
|
||||
@ -450,7 +472,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10036,
|
||||
@ -469,7 +492,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10041,
|
||||
@ -488,7 +512,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10042,
|
||||
@ -507,7 +532,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10043,
|
||||
@ -528,7 +554,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10044,
|
||||
@ -547,7 +574,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10045,
|
||||
@ -568,7 +596,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10046,
|
||||
@ -587,7 +616,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10051,
|
||||
@ -606,7 +636,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10052,
|
||||
@ -625,7 +656,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10053,
|
||||
@ -646,7 +678,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10054,
|
||||
@ -665,7 +698,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10055,
|
||||
@ -686,7 +720,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 10056,
|
||||
@ -705,7 +740,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1001
|
||||
"addlibrary": 1001,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11001,
|
||||
@ -724,7 +760,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11002,
|
||||
@ -743,7 +780,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11003,
|
||||
@ -764,7 +802,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11004,
|
||||
@ -783,7 +822,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11005,
|
||||
@ -804,7 +844,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11006,
|
||||
@ -823,7 +864,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11011,
|
||||
@ -842,7 +884,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11012,
|
||||
@ -861,7 +904,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11013,
|
||||
@ -882,7 +926,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11014,
|
||||
@ -901,7 +946,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11015,
|
||||
@ -922,7 +968,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11016,
|
||||
@ -941,7 +988,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11021,
|
||||
@ -960,7 +1008,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11022,
|
||||
@ -979,7 +1028,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11023,
|
||||
@ -1000,7 +1050,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11024,
|
||||
@ -1019,7 +1070,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11025,
|
||||
@ -1040,7 +1092,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11026,
|
||||
@ -1059,7 +1112,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11031,
|
||||
@ -1078,7 +1132,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11032,
|
||||
@ -1097,7 +1152,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11033,
|
||||
@ -1118,7 +1174,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11034,
|
||||
@ -1137,7 +1194,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11035,
|
||||
@ -1158,7 +1216,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11036,
|
||||
@ -1177,7 +1236,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11041,
|
||||
@ -1196,7 +1256,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11042,
|
||||
@ -1215,7 +1276,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11043,
|
||||
@ -1236,7 +1298,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11044,
|
||||
@ -1255,7 +1318,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11045,
|
||||
@ -1276,7 +1340,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11046,
|
||||
@ -1295,7 +1360,8 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11051,
|
||||
@ -1314,7 +1380,8 @@
|
||||
30,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11052,
|
||||
@ -1333,7 +1400,8 @@
|
||||
50,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11053,
|
||||
@ -1354,7 +1422,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11054,
|
||||
@ -1373,7 +1442,8 @@
|
||||
40,
|
||||
20
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11055,
|
||||
@ -1394,7 +1464,8 @@
|
||||
40,
|
||||
10
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
},
|
||||
{
|
||||
"id": 11056,
|
||||
@ -1413,6 +1484,7 @@
|
||||
35,
|
||||
5
|
||||
],
|
||||
"addlibrary": 1101
|
||||
"addlibrary": 1101,
|
||||
"ico": ""
|
||||
}
|
||||
]
|
||||
@ -3,102 +3,119 @@
|
||||
"suittype": 0,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 1,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 2,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 3,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 4,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 5,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 6,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 7,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 8,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 9,
|
||||
"suitnum": 4,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 100,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 101,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 102,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 103,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 104,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 105,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
},
|
||||
{
|
||||
"suittype": 106,
|
||||
"suitnum": 2,
|
||||
"skill": 100012000,
|
||||
"skillname": "",
|
||||
"skillintr": ""
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@ -4724,5 +4724,56 @@
|
||||
"Desc": [
|
||||
"对目标造成攻击力40%的伤害"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 190087000,
|
||||
"Name": "梦之贪婪",
|
||||
"ico": "jn_icon_001",
|
||||
"Type": 2,
|
||||
"MaxLV": 6,
|
||||
"CD": [
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4
|
||||
],
|
||||
"Target": 0,
|
||||
"ChildSkill": [
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
}
|
||||
],
|
||||
"Desc": [
|
||||
"攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害"
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -3,6 +3,7 @@
|
||||
"shopid": 1,
|
||||
"tab": 1,
|
||||
"shopname": "金币商店",
|
||||
"upper_shop": "",
|
||||
"needshow": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -35,6 +36,7 @@
|
||||
"shopid": 2,
|
||||
"tab": 2,
|
||||
"shopname": "钻石商店",
|
||||
"upper_shop": "",
|
||||
"needshow": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -59,6 +61,7 @@
|
||||
"shopid": 3,
|
||||
"tab": 3,
|
||||
"shopname": "PVP商店",
|
||||
"upper_shop": "玩法商店",
|
||||
"needshow": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -83,6 +86,7 @@
|
||||
"shopid": 4,
|
||||
"tab": 4,
|
||||
"shopname": "PVE商店",
|
||||
"upper_shop": "玩法商店",
|
||||
"needshow": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -107,6 +111,7 @@
|
||||
"shopid": 5,
|
||||
"tab": 5,
|
||||
"shopname": "联盟商店",
|
||||
"upper_shop": "玩法商店",
|
||||
"needshow": [
|
||||
{
|
||||
"a": "attr",
|
||||
|
||||
@ -84,7 +84,9 @@
|
||||
"Desc": "随机对敌方3个目标造成80%攻击力伤害，优先选择防御力小于自身的目标",
|
||||
"From": 2,
|
||||
"Limit": 3,
|
||||
"Where": [],
|
||||
"Where": [
|
||||
"Type=MyProJudge"
|
||||
],
|
||||
"Order": [
|
||||
"Type=Sort,SortType=0,Key=Total_Def,SortMet=0",
|
||||
"Type=Rnd,SortType=ProJudge,RelyType=0,Key=Total_Def,Op=0",
|
||||
@ -230,7 +232,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -272,7 +274,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -314,7 +316,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -356,7 +358,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -461,7 +463,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -524,7 +526,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=2,Type=TagBuff",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -545,7 +547,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2,Type=TagBuff",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -566,7 +568,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=2,Type=CallSkillPas,PasPr=1000,PasReVal=1",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -587,7 +589,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddBuff",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003001,Round=2,Type=TagBuff",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -1167,7 +1169,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "RobPro",
|
||||
"Argu": "DoVal=1,Pr=1000,RobTarget=0,Pro=ActValue,Num=300",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -1238,7 +1240,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "BuffAction",
|
||||
"Argu": "DoVal=1,Pr=1000,ActionType=1,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1,Tag=0",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -1263,7 +1265,7 @@
|
||||
"EmitPR": 1000,
|
||||
"Type": "BuffAction",
|
||||
"Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=-1,Tag=1",
|
||||
"AddEffect": true,
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -3442,5 +3444,50 @@
|
||||
"NoRelyTags": [
|
||||
"301"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 290087001,
|
||||
"Desc": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害",
|
||||
"From": 3,
|
||||
"Limit": 1,
|
||||
"Where": [],
|
||||
"Order": [
|
||||
"Type=Rnd"
|
||||
],
|
||||
"EmitPR": 1000,
|
||||
"Type": "AddPas",
|
||||
"Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasDmgPar=400,PasId1=290087002",
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"Tags": [],
|
||||
"RelyTags": [],
|
||||
"NoRelyTags": []
|
||||
},
|
||||
{
|
||||
"Id": 290087002,
|
||||
"Desc": "对敌方全体造成80%攻击力伤害",
|
||||
"From": 2,
|
||||
"Limit": 5,
|
||||
"Where": [],
|
||||
"Order": [
|
||||
"Type=Rnd"
|
||||
],
|
||||
"EmitPR": 1000,
|
||||
"Type": "Dmg",
|
||||
"Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
|
||||
"AddEffect": false,
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"Tags": [
|
||||
"102",
|
||||
"101"
|
||||
],
|
||||
"RelyTags": [],
|
||||
"NoRelyTags": []
|
||||
}
|
||||
]
|
||||
@ -4724,5 +4724,56 @@
|
||||
"Desc": [
|
||||
"对目标造成攻击力40%的伤害"
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 190087000,
|
||||
"Name": "梦之贪婪",
|
||||
"ico": "jn_icon_001",
|
||||
"Type": 2,
|
||||
"MaxLV": 6,
|
||||
"CD": [
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
4
|
||||
],
|
||||
"Target": 0,
|
||||
"ChildSkill": [
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": [
|
||||
290087001
|
||||
]
|
||||
}
|
||||
],
|
||||
"Desc": [
|
||||
"攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害"
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -620,5 +620,21 @@
|
||||
"Tags": [],
|
||||
"RelyTags": [],
|
||||
"NoRelyTags": []
|
||||
},
|
||||
{
|
||||
"Id": 490087001,
|
||||
"Desc": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害",
|
||||
"When": "ImpEff",
|
||||
"Where": "Target=3,EffType=1,EffID=101",
|
||||
"AddCon": [
|
||||
"Type=ProJudge,JudgeType=1,Key=NowHp_Per,Op=0,Val=500"
|
||||
],
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 0,
|
||||
"OverlayTimes": 0,
|
||||
"SameID": false,
|
||||
"Tags": [],
|
||||
"RelyTags": [],
|
||||
"NoRelyTags": []
|
||||
}
|
||||
]
|
||||
@ -428,7 +428,7 @@
|
||||
"blur": 0,
|
||||
"package": "roledetails/roledetails",
|
||||
"packagename": "roledetails",
|
||||
"comname": "main",
|
||||
"comname": "roledetails",
|
||||
"des": "英雄详细信息"
|
||||
},
|
||||
{
|
||||
@ -453,7 +453,7 @@
|
||||
"package": "notice/notice",
|
||||
"packagename": "notice",
|
||||
"comname": "main",
|
||||
"des": "背包"
|
||||
"des": "公告"
|
||||
},
|
||||
{
|
||||
"id": "mainbarrier",
|
||||
@ -467,6 +467,18 @@
|
||||
"comname": "battledetails",
|
||||
"des": "主线任务关卡界面"
|
||||
},
|
||||
{
|
||||
"id": "mainworld",
|
||||
"file": "MainWorldWindow",
|
||||
"unloadpkg": 2,
|
||||
"loadtype": 1,
|
||||
"full": 1,
|
||||
"blur": 0,
|
||||
"package": "mainline/mainline",
|
||||
"packagename": "mainline",
|
||||
"comname": "main",
|
||||
"des": "主线任务世界界面"
|
||||
},
|
||||
{
|
||||
"id": "rewardTips",
|
||||
"file": "RewardTipsWindow",
|
||||
@ -482,13 +494,37 @@
|
||||
{
|
||||
"id": "roleupgrade",
|
||||
"file": "RoleUpGradeWindow",
|
||||
"unloadpkg": 1,
|
||||
"unloadpkg": 5,
|
||||
"loadtype": 1,
|
||||
"full": 2,
|
||||
"blur": 1,
|
||||
"full": 0,
|
||||
"blur": 0,
|
||||
"package": "roledetails/roledetails",
|
||||
"packagename": "roledetails",
|
||||
"comname": "roleupgrade",
|
||||
"des": "英雄升级升星详情"
|
||||
},
|
||||
{
|
||||
"id": "manual",
|
||||
"file": "HeroManualWindow",
|
||||
"unloadpkg": 1,
|
||||
"loadtype": 0,
|
||||
"full": 1,
|
||||
"blur": 0,
|
||||
"package": "roledetails/roledetails",
|
||||
"packagename": "roledetails",
|
||||
"comname": "manual",
|
||||
"des": "英雄图鉴"
|
||||
},
|
||||
{
|
||||
"id": "task",
|
||||
"file": "TaskWindow",
|
||||
"unloadpkg": 0,
|
||||
"loadtype": 1,
|
||||
"full": 0,
|
||||
"blur": 0,
|
||||
"package": "task/task",
|
||||
"packagename": "task",
|
||||
"comname": "main",
|
||||
"des": "任务"
|
||||
}
|
||||
]
|
||||
@ -43,7 +43,7 @@ type (
|
||||
// heroId 英雄ID
|
||||
GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode)
|
||||
// 佩戴装备
|
||||
UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode)
|
||||
UpdateEquipment(session IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode)
|
||||
//获取玩家英雄列表
|
||||
GetHeroList(uid string) []*pb.DBHero
|
||||
//
|
||||
|
||||
@ -112,7 +112,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
|
||||
}
|
||||
}
|
||||
//更新装备数据加成
|
||||
if code = this.module.ModuleHero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success {
|
||||
if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); code == pb.ErrorCode_Success {
|
||||
if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil {
|
||||
log.Errorf("Equip err%v", err)
|
||||
code = pb.ErrorCode_SystemError
|
||||
|
||||
@ -66,7 +66,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
|
||||
}
|
||||
}
|
||||
if issucc {
|
||||
if code = this.module.CheckConsumeRes(session, intensify.Need, true); code != pb.ErrorCode_Success {
|
||||
if code = this.module.ConsumeRes(session, intensify.Need, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
modifyequipments = make([]*pb.DB_Equipment, 0)
|
||||
@ -137,7 +137,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
|
||||
}
|
||||
}
|
||||
}
|
||||
code = this.module.ModuleHero.UpdateEquipment(hero, equipments)
|
||||
code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments)
|
||||
}
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "upgrade", &pb.EquipmentUpgradeResp{IsSucc: issucc, Equipment: modifyequipments})
|
||||
|
||||
@ -55,7 +55,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
|
||||
return
|
||||
}
|
||||
// 消耗校验
|
||||
code = this.module.CheckConsumeRes(session, awakenData.Phaseneed, true)
|
||||
code = this.module.ConsumeRes(session, awakenData.Phaseneed, true)
|
||||
if code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
@ -4,13 +4,14 @@ import (
|
||||
"crypto/rand"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"math/big"
|
||||
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode) {
|
||||
if req.DrawCount != 1 && req.DrawCount != 10 { // 只能是单抽或10抽
|
||||
if req.DrawType <= 0 { // 只能是单抽或10抽
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
}
|
||||
return
|
||||
@ -19,12 +20,25 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa
|
||||
//抽卡
|
||||
func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) {
|
||||
var (
|
||||
szCards []int32 // 最终抽到的卡牌
|
||||
totalWeight int64 // 总权重
|
||||
curWeigth int64 // 临时随机获得的权重
|
||||
szCards []int32 // 最终抽到的卡牌
|
||||
totalWeight int64 // 总权重
|
||||
curWeigth int64 // 临时随机获得的权重
|
||||
drawTimes int32 // 抽卡次数
|
||||
hitStar4 int32 // 抽了多少次还没获得4星英雄
|
||||
hitStar5 int32 // 抽了多少次还没获得5星英雄
|
||||
hitStar int32 // 抽中几星
|
||||
curStar4Count int32 // 当前4星没抽到的次数
|
||||
curStar5Count int32 // 当前5星没抽到的次数
|
||||
floor4Count int32 // 4星保底次数
|
||||
floor5Count int32 // 5星保底次数
|
||||
|
||||
)
|
||||
szCards = make([]int32, 0)
|
||||
rsp := &pb.HeroDrawCardResp{}
|
||||
curStar4Count = this.GetFloorStarData(req.DrawType, session.GetUserId(), 4)
|
||||
curStar5Count = this.GetFloorStarData(req.DrawType, session.GetUserId(), 5)
|
||||
this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count)
|
||||
|
||||
// 抽卡相关
|
||||
// 获取配置文件的权重信息
|
||||
_conf, err := this.module.configure.GetHeroDrawConfig()
|
||||
@ -32,26 +46,108 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
|
||||
_costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType)
|
||||
if err != nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
floor4Count = _costConf.Floor4 // 4星保底次数
|
||||
floor5Count = _costConf.Floor5 // 五星保底次数
|
||||
if floor4Count == 0 || floor5Count == 0 {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
sz := make([]*cfg.Game_atn, 0)
|
||||
sz = append(sz, _costConf.Cost)
|
||||
code = this.module.CheckRes(session, sz) // 消耗校验
|
||||
if code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
drawTimes = _costConf.Count // 抽卡次数
|
||||
for _, v := range _conf.GetDataList() {
|
||||
totalWeight += int64(v.Weight) // 统计所有权重
|
||||
}
|
||||
|
||||
for i := 0; i < int(req.DrawCount); i++ {
|
||||
this.module.configure.GetDrawUpDrawConfig()
|
||||
drawTimes = 1
|
||||
for i := 0; i < int(drawTimes); i++ {
|
||||
n, _ := rand.Int(rand.Reader, big.NewInt(totalWeight)) // [0,totalWeight)
|
||||
for _, v := range _conf.GetDataList() {
|
||||
curWeigth += int64(v.Weight)
|
||||
if curWeigth < n.Int64() { // 命中
|
||||
szCards = append(szCards, v.Id)
|
||||
// 获取当前星级
|
||||
_getCardCfg := this.module.configure.GetHero(v.Id) //获取的英雄信息
|
||||
if _getCardCfg != nil {
|
||||
continue
|
||||
}
|
||||
if _getCardCfg.Star == 4 { // 当抽取到的英雄是4星的时候 清除 该类型的保底次数
|
||||
this.SetFloorStarData(req.DrawType, session.GetUserId(), 4)
|
||||
hitStar4 = 0
|
||||
hitStar = 4
|
||||
break
|
||||
} else if _getCardCfg.Star == 5 { // 当抽取到的英雄是5星的时候 清除 该类型的保底次数
|
||||
this.SetFloorStarData(req.DrawType, session.GetUserId(), 5)
|
||||
hitStar5 = 0 // 清0
|
||||
hitStar = 5
|
||||
break
|
||||
}
|
||||
hitStar4++
|
||||
hitStar5++
|
||||
|
||||
if hitStar4 >= floor4Count { // 达到保底次数了 修改当前卡牌星级
|
||||
break
|
||||
}
|
||||
if hitStar5 >= floor5Count { // 触发5星保底
|
||||
// 5星卡池找
|
||||
break
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
if hitStar != 0 {
|
||||
hitStar = 0
|
||||
this.ModifyFloorStarData(req.DrawType, session.GetUserId(), hitStar) // 重置该星级保底
|
||||
}
|
||||
}
|
||||
if hitStar4 != 0 {
|
||||
this.AddFloorStarData(req.DrawType, session.GetUserId(), 4, hitStar4) // 增加4星保底次数
|
||||
}
|
||||
|
||||
if hitStar5 != 0 {
|
||||
this.AddFloorStarData(req.DrawType, session.GetUserId(), 5, hitStar5) // 增加5星保底次数
|
||||
}
|
||||
//计算保底
|
||||
|
||||
if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil {
|
||||
code = pb.ErrorCode_HeroCreate
|
||||
return
|
||||
}
|
||||
|
||||
rsp.Heroes = szCards
|
||||
session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
|
||||
return
|
||||
}
|
||||
|
||||
// 获取当前卡牌类型保底次数
|
||||
func (this *apiComp) GetFloorStarData(drawType int32, uid string, star int32) (count int32) {
|
||||
return
|
||||
}
|
||||
|
||||
// 清除保底信息(drawType 抽卡类型)
|
||||
func (this *apiComp) SetFloorStarData(drawType int32, uid string, star int32) {
|
||||
return
|
||||
}
|
||||
|
||||
// 当前没有抽中 增加保底次数
|
||||
func (this *apiComp) AddFloorStarData(drawType int32, uid string, star int32, count int32) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// 当前有抽中 修改保底次数
|
||||
func (this *apiComp) ModifyFloorStarData(drawType int32, uid string, star int32) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
|
||||
return
|
||||
}
|
||||
|
||||
code = this.module.CheckConsumeRes(session, resonConfig.Need, true)
|
||||
code = this.module.ConsumeRes(session, resonConfig.Need, true)
|
||||
if code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
|
||||
return
|
||||
}
|
||||
// 消耗校验
|
||||
code = this.module.CheckConsumeRes(session, _costConfig.Var, true)
|
||||
code = this.module.ConsumeRes(session, _costConfig.Var, true)
|
||||
if code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
@ -145,7 +145,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
|
||||
N: costGold,
|
||||
}
|
||||
res = append(res, _d)
|
||||
code = this.module.CheckConsumeRes(session, res, true)
|
||||
code = this.module.ConsumeRes(session, res, true)
|
||||
if code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
@ -22,6 +22,7 @@ const (
|
||||
hero_awaken = "game_heroawaken.json" // 英雄觉醒
|
||||
hero_drawcard = "game_drawcard.json" // 抽卡
|
||||
hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整
|
||||
hero_drawcost = "game_drawcost.json" // 抽卡消耗
|
||||
)
|
||||
|
||||
///配置管理组件
|
||||
@ -47,6 +48,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
hero_awaken: cfg.NewGame_heroAwaken,
|
||||
hero_drawcard: cfg.NewGame_drawCard,
|
||||
hero_drawupdraw: cfg.NewGame_drawUpdraw,
|
||||
hero_drawcost: cfg.NewGame_drawCost,
|
||||
})
|
||||
|
||||
return
|
||||
@ -350,12 +352,13 @@ func (this *configureComp) GetHeroAwakenConfig() (configure *cfg.Game_heroAwaken
|
||||
return
|
||||
}
|
||||
|
||||
// 抽卡配置表
|
||||
func (this *configureComp) GetHeroDrawConfig() (configure *cfg.Game_drawCard, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(hero_stargrow); err == nil {
|
||||
if v, err = this.GetConfigure(hero_drawcard); err == nil {
|
||||
if configure, ok = v.(*cfg.Game_drawCard); !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
|
||||
return
|
||||
@ -367,12 +370,13 @@ func (this *configureComp) GetHeroDrawConfig() (configure *cfg.Game_drawCard, er
|
||||
return
|
||||
}
|
||||
|
||||
// 抽卡概率提高
|
||||
func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(hero_stargrow); err == nil {
|
||||
if v, err = this.GetConfigure(hero_drawupdraw); err == nil {
|
||||
if configure, ok = v.(*cfg.Game_drawUpdraw); !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawUpdraw", v)
|
||||
return
|
||||
@ -383,3 +387,40 @@ func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// 抽卡消耗
|
||||
func (this *configureComp) GetDrawCostConfig() (configure *cfg.Game_drawCost, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(hero_drawcost); err == nil {
|
||||
if configure, ok = v.(*cfg.Game_drawCost); !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetDrawCostConfigByID(id int32) (data *cfg.Game_drawCostData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(hero_drawcost); err == nil {
|
||||
if configure, ok := v.(*cfg.Game_drawCost); !ok {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
|
||||
return
|
||||
} else {
|
||||
data = configure.Get(id)
|
||||
}
|
||||
|
||||
} else {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -415,6 +415,8 @@ func (this *ModelHero) HeroStarUp(session comm.IUserSession, hero *pb.DBHero) (c
|
||||
"star": hero.Star + 1,
|
||||
"isOverlying": false,
|
||||
}
|
||||
// 触发星级任务
|
||||
this.moduleHero.ModuleTask.SendToTask(session.GetUserId(), comm.TaskTypeGetHero, &pb.TaskParam{First: hero.Star + 1})
|
||||
// 保存数据
|
||||
err1 := this.modifyHeroData(session.GetUserId(), hero.Id, _heroMap)
|
||||
if err1 != nil {
|
||||
|
||||
@ -58,7 +58,7 @@ func (this *Hero) GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) {
|
||||
}
|
||||
|
||||
//佩戴装备
|
||||
func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) {
|
||||
func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) {
|
||||
if hero == nil {
|
||||
code = pb.ErrorCode_HeroNoExist
|
||||
return
|
||||
@ -69,6 +69,12 @@ func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (co
|
||||
return
|
||||
}
|
||||
this.modelHero.setEquipProperty(hero, equip)
|
||||
|
||||
err1 := this.modelHero.PushHeroProperty(session, hero.Id) // 推送属性变化
|
||||
if err1 != nil {
|
||||
code = pb.ErrorCode_Unknown
|
||||
this.Errorf("PushHeroProperty err!")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
|
||||
}
|
||||
res = append(res, d)
|
||||
}
|
||||
code = this.module.api.module.CheckConsumeRes(session, res, true) // 领取附件
|
||||
code = this.module.api.module.ConsumeRes(session, res, true) // 领取附件
|
||||
if code == pb.ErrorCode_Success {
|
||||
// 修改状态
|
||||
this.module.modelMail.Mail_UpdateMailAttachmentState(req.ObjID)
|
||||
|
||||
@ -143,8 +143,44 @@ func (this *ModuleBase) SendMsgToUsers(mainType, subType string, msg proto.Messa
|
||||
return
|
||||
}
|
||||
|
||||
//校验消耗资源
|
||||
func (this *ModuleBase) CheckConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) {
|
||||
// 只校验资源 参数 atn格式
|
||||
func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Game_atn) (code pb.ErrorCode) {
|
||||
var (
|
||||
err error
|
||||
resID int
|
||||
amount int32
|
||||
)
|
||||
|
||||
source := &comm.ModuleCallSource{
|
||||
Module: string(this.module.GetType()),
|
||||
FuncName: "CheckRes",
|
||||
Describe: "检查资源是否够",
|
||||
}
|
||||
//校验消费资源是否充足
|
||||
for _, v := range res {
|
||||
if v.A == comm.AttrType { //用户属性资源
|
||||
if amount = this.ModuleUser.QueryAttributeValue(session.GetUserId(), v.T); amount < v.N {
|
||||
code = pb.ErrorCode_ResNoEnough
|
||||
this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N)
|
||||
return
|
||||
}
|
||||
} else if v.A == comm.ItemType { //道具资源
|
||||
if resID, err = strconv.Atoi(v.T); err != nil {
|
||||
code = pb.ErrorCode_ConfigurationException
|
||||
return
|
||||
}
|
||||
if amount = int32(this.ModuleItems.QueryItemAmount(source, session.GetSessionId(), int32(resID))); amount < v.N {
|
||||
code = pb.ErrorCode_ResNoEnough
|
||||
this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//消耗资源
|
||||
func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) {
|
||||
var (
|
||||
err error
|
||||
resID int
|
||||
|
||||
@ -55,7 +55,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
|
||||
}
|
||||
}
|
||||
|
||||
if code = this.module.CheckConsumeRes(session, conf.Need, true); code != pb.ErrorCode_Success {
|
||||
if code = this.module.ConsumeRes(session, conf.Need, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
if code = this.module.DispenseRes(session, conf.Iteminfo, true); code != pb.ErrorCode_Success {
|
||||
|
||||
@ -94,7 +94,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
|
||||
}
|
||||
|
||||
if req.IsManualRefresh && shopconf.Rtype == 1 { //可以手动刷新
|
||||
if code = this.module.CheckConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success {
|
||||
if code = this.module.ConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
var _items []*cfg.Game_shopitemData
|
||||
|
||||
@ -50,7 +50,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
|
||||
}
|
||||
|
||||
//奖励
|
||||
if code = this.moduleTask.CheckConsumeRes(session, conf.Reword, true); code != pb.ErrorCode_Success {
|
||||
if code = this.moduleTask.ConsumeRes(session, conf.Reword, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
29
modules/user/model_record.go
Normal file
29
modules/user/model_record.go
Normal file
@ -0,0 +1,29 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 记录一些扩展数据
|
||||
type ModelRecord struct {
|
||||
modules.MCompModel
|
||||
}
|
||||
|
||||
func (this *ModelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
err = this.MCompModel.Init(service, module, comp, options)
|
||||
this.TableName = "userrecord"
|
||||
return
|
||||
}
|
||||
|
||||
//获取用户
|
||||
func (this *ModelRecord) getUserSession(uid string) (cuser *pb.CacheUser) {
|
||||
cuser = &pb.CacheUser{}
|
||||
if err := this.Get(uid, cuser); err != nil {
|
||||
log.Errorf("GetUserSession err:%v", err)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -153,3 +153,9 @@ func (this *User) UserChangePush(session comm.IUserSession, resChange *pb.UserRe
|
||||
session.SendMsg(string(this.GetType()), "reschange", resChange)
|
||||
return
|
||||
}
|
||||
|
||||
// 设置record
|
||||
func (this *User) GetUserRecordData(uid string, typeValue int32, parmare int32) (value int32, err error) {
|
||||
//pb.DBUserRecord
|
||||
return
|
||||
}
|
||||
|
||||
@ -1543,7 +1543,7 @@ type HeroDrawCardReq struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
DrawCount int32 `protobuf:"varint,1,opt,name=drawCount,proto3" json:"drawCount"` // 抽卡次数, 只能是单抽和十抽
|
||||
DrawType int32 `protobuf:"varint,1,opt,name=drawType,proto3" json:"drawType"` // 抽卡类型 见drawCardCost表
|
||||
}
|
||||
|
||||
func (x *HeroDrawCardReq) Reset() {
|
||||
@ -1578,9 +1578,9 @@ func (*HeroDrawCardReq) Descriptor() ([]byte, []int) {
|
||||
return file_hero_hero_msg_proto_rawDescGZIP(), []int{29}
|
||||
}
|
||||
|
||||
func (x *HeroDrawCardReq) GetDrawCount() int32 {
|
||||
func (x *HeroDrawCardReq) GetDrawType() int32 {
|
||||
if x != nil {
|
||||
return x.DrawCount
|
||||
return x.DrawType
|
||||
}
|
||||
return 0
|
||||
}
|
||||
@ -1782,13 +1782,13 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
|
||||
0x2f, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52,
|
||||
0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74,
|
||||
0x22, 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01,
|
||||
0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04,
|
||||
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x2d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52,
|
||||
0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x22, 0x2a,
|
||||
0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
|
||||
0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -147,7 +147,7 @@ message HeroDelHeroPush {
|
||||
|
||||
// 抽卡
|
||||
message HeroDrawCardReq {
|
||||
int32 drawCount = 1; // 抽卡次数, 只能是单抽和十抽
|
||||
int32 drawType = 1; // 抽卡类型 见drawCardCost表
|
||||
}
|
||||
|
||||
message HeroDrawCardResp {
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
syntax = "proto3";
|
||||
option go_package = ".;pb";
|
||||
|
||||
|
||||
//用户扩展数据
|
||||
message DBUserExpand {
|
||||
string id = 1; //主键id
|
||||
string uid = 2; //用户id
|
||||
int64 lastreadnotiftime = 3; //最后阅读公告时间
|
||||
int32 chatchannel = 4; //跨服聊天频道
|
||||
}
|
||||
string id = 1; //主键id
|
||||
string uid = 2; //用户id
|
||||
int64 lastreadnotiftime = 3; //最后阅读公告时间
|
||||
int64 lastInitdataTime = 4; //上次初始数据时间
|
||||
uint32 initdataCount = 5; //今日初始累计次数
|
||||
int32 chatchannel = 6; //跨服聊天频道
|
||||
}
|
||||
|
||||
@ -4,10 +4,10 @@ option go_package = ".;pb";
|
||||
|
||||
//用户扩展数据
|
||||
message DBUserRecord {
|
||||
string id = 1; // 主键id
|
||||
string id = 1; //@go_tags(`bson:"_id"`) ID 主键id
|
||||
string uid = 2; // 用户id
|
||||
int32 type = 3; // 数据类型
|
||||
int32 parame = 4; // 参数
|
||||
int32 value = 5; // 值
|
||||
map<string,int32> floors = 3; // 保底信息
|
||||
int32 triggernum = 4; // 没有触发次数
|
||||
int64 mtime = 5; // 修改时间
|
||||
int64 ctime = 6; // 创建时间
|
||||
}
|
||||
@ -29,7 +29,9 @@ type DBUserExpand struct {
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
|
||||
Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间
|
||||
Chatchannel int32 `protobuf:"varint,4,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道
|
||||
LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间
|
||||
InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数
|
||||
Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道
|
||||
}
|
||||
|
||||
func (x *DBUserExpand) Reset() {
|
||||
@ -85,6 +87,20 @@ func (x *DBUserExpand) GetLastreadnotiftime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBUserExpand) GetLastInitdataTime() int64 {
|
||||
if x != nil {
|
||||
return x.LastInitdataTime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBUserExpand) GetInitdataCount() uint32 {
|
||||
if x != nil {
|
||||
return x.InitdataCount
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBUserExpand) GetChatchannel() int32 {
|
||||
if x != nil {
|
||||
return x.Chatchannel
|
||||
@ -96,16 +112,21 @@ var File_userexpand_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_userexpand_proto_rawDesc = []byte{
|
||||
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
|
||||
0x74, 0x6f, 0x22, 0xd2, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
|
||||
0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
|
||||
0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
|
||||
0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74,
|
||||
0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e,
|
||||
0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68,
|
||||
0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64,
|
||||
0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c,
|
||||
0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61,
|
||||
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61,
|
||||
0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74,
|
||||
0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
|
||||
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -26,12 +26,12 @@ type DBUserRecord struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` // 主键id
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` // 用户id
|
||||
Type int32 `protobuf:"varint,3,opt,name=type,proto3" json:"type"` // 数据类型
|
||||
Parame int32 `protobuf:"varint,4,opt,name=parame,proto3" json:"parame"` // 参数
|
||||
Value int32 `protobuf:"varint,5,opt,name=value,proto3" json:"value"` // 值
|
||||
Ctime int64 `protobuf:"varint,6,opt,name=ctime,proto3" json:"ctime"` // 创建时间
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` // 用户id
|
||||
Floors map[string]int32 `protobuf:"bytes,3,rep,name=floors,proto3" json:"floors" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 保底信息
|
||||
Triggernum int32 `protobuf:"varint,4,opt,name=triggernum,proto3" json:"triggernum"` // 没有触发次数
|
||||
Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间
|
||||
Ctime int64 `protobuf:"varint,6,opt,name=ctime,proto3" json:"ctime"` // 创建时间
|
||||
}
|
||||
|
||||
func (x *DBUserRecord) Reset() {
|
||||
@ -80,23 +80,23 @@ func (x *DBUserRecord) GetUid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBUserRecord) GetType() int32 {
|
||||
func (x *DBUserRecord) GetFloors() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Type
|
||||
return x.Floors
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBUserRecord) GetTriggernum() int32 {
|
||||
if x != nil {
|
||||
return x.Triggernum
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBUserRecord) GetParame() int32 {
|
||||
func (x *DBUserRecord) GetMtime() int64 {
|
||||
if x != nil {
|
||||
return x.Parame
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBUserRecord) GetValue() int32 {
|
||||
if x != nil {
|
||||
return x.Value
|
||||
return x.Mtime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
@ -112,16 +112,22 @@ var File_userrecord_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_userrecord_proto_rawDesc = []byte{
|
||||
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x22, 0x88, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63,
|
||||
0x74, 0x6f, 0x22, 0xea, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63,
|
||||
0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
|
||||
0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
|
||||
0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x18,
|
||||
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65,
|
||||
0x63, 0x6f, 0x72, 0x64, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x06, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67,
|
||||
0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72,
|
||||
0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d,
|
||||
0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -136,16 +142,18 @@ func file_userrecord_proto_rawDescGZIP() []byte {
|
||||
return file_userrecord_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
|
||||
var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||
var file_userrecord_proto_goTypes = []interface{}{
|
||||
(*DBUserRecord)(nil), // 0: DBUserRecord
|
||||
nil, // 1: DBUserRecord.FloorsEntry
|
||||
}
|
||||
var file_userrecord_proto_depIdxs = []int32{
|
||||
0, // [0:0] is the sub-list for method output_type
|
||||
0, // [0:0] is the sub-list for method input_type
|
||||
0, // [0:0] is the sub-list for extension type_name
|
||||
0, // [0:0] is the sub-list for extension extendee
|
||||
0, // [0:0] is the sub-list for field type_name
|
||||
1, // 0: DBUserRecord.floors:type_name -> DBUserRecord.FloorsEntry
|
||||
1, // [1:1] is the sub-list for method output_type
|
||||
1, // [1:1] is the sub-list for method input_type
|
||||
1, // [1:1] is the sub-list for extension type_name
|
||||
1, // [1:1] is the sub-list for extension extendee
|
||||
0, // [0:1] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_userrecord_proto_init() }
|
||||
@ -173,7 +181,7 @@ func file_userrecord_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_userrecord_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 1,
|
||||
NumMessages: 2,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -53,6 +53,10 @@ type Tables struct {
|
||||
mainlineEasy *Game_mainlineEasy
|
||||
mainlineHard *Game_mainlineHard
|
||||
mainlinePurgatory *Game_mainlinePurgatory
|
||||
drawCard *Game_drawCard
|
||||
drawUpdraw *Game_drawUpdraw
|
||||
drawCom *Game_drawCom
|
||||
drawCost *Game_drawCost
|
||||
}
|
||||
|
||||
func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
@ -306,5 +310,29 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_drawcard") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_drawupdraw") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_drawcom") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_drawcost") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tables, nil
|
||||
}
|
||||
|
||||
42
sys/configure/structs/game.drawCom.go
Normal file
42
sys/configure/structs/game.drawCom.go
Normal file
@ -0,0 +1,42 @@
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
package cfg
|
||||
|
||||
type Game_drawCom struct {
|
||||
_dataMap map[string]*Game_drawComData
|
||||
_dataList []*Game_drawComData
|
||||
}
|
||||
|
||||
func NewGame_drawCom(_buf []map[string]interface{}) (*Game_drawCom, error) {
|
||||
_dataList := make([]*Game_drawComData, 0, len(_buf))
|
||||
dataMap := make(map[string]*Game_drawComData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := NewGame_drawComData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Key] = _v
|
||||
}
|
||||
}
|
||||
return &Game_drawCom{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *Game_drawCom) GetDataMap() map[string]*Game_drawComData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *Game_drawCom) GetDataList() []*Game_drawComData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *Game_drawCom) Get(key string) *Game_drawComData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
27
sys/configure/structs/game.drawComData.go
Normal file
27
sys/configure/structs/game.drawComData.go
Normal file
@ -0,0 +1,27 @@
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type Game_drawComData struct {
|
||||
Key string
|
||||
Value int32
|
||||
}
|
||||
|
||||
func (Game_drawComData) GetTypeId() int {
|
||||
return 2052037355
|
||||
}
|
||||
|
||||
func NewGame_drawComData(_buf map[string]interface{}) (_v *Game_drawComData, err error) {
|
||||
_v = &Game_drawComData{}
|
||||
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
42
sys/configure/structs/game.drawCost.go
Normal file
42
sys/configure/structs/game.drawCost.go
Normal file
@ -0,0 +1,42 @@
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
package cfg
|
||||
|
||||
type Game_drawCost struct {
|
||||
_dataMap map[int32]*Game_drawCostData
|
||||
_dataList []*Game_drawCostData
|
||||
}
|
||||
|
||||
func NewGame_drawCost(_buf []map[string]interface{}) (*Game_drawCost, error) {
|
||||
_dataList := make([]*Game_drawCostData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*Game_drawCostData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := NewGame_drawCostData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Key] = _v
|
||||
}
|
||||
}
|
||||
return &Game_drawCost{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *Game_drawCost) GetDataMap() map[int32]*Game_drawCostData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *Game_drawCost) GetDataList() []*Game_drawCostData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *Game_drawCost) Get(key int32) *Game_drawCostData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
37
sys/configure/structs/game.drawCostData.go
Normal file
37
sys/configure/structs/game.drawCostData.go
Normal file
@ -0,0 +1,37 @@
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type Game_drawCostData struct {
|
||||
Key int32
|
||||
Count int32
|
||||
Cost *Game_atn
|
||||
Floor4 int32
|
||||
Floor5 int32
|
||||
Floor4cards int32
|
||||
Floor5cards int32
|
||||
}
|
||||
|
||||
func (Game_drawCostData) GetTypeId() int {
|
||||
return -596129033
|
||||
}
|
||||
|
||||
func NewGame_drawCostData(_buf map[string]interface{}) (_v *Game_drawCostData, err error) {
|
||||
_v = &Game_drawCostData{}
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count"].(float64); !_ok_ { err = errors.New("count error"); return }; _v.Count = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["cost"].(map[string]interface{}); !_ok_ { err = errors.New("cost error"); return }; if _v.Cost, err = NewGame_atn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4"].(float64); !_ok_ { err = errors.New("floor4 error"); return }; _v.Floor4 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5"].(float64); !_ok_ { err = errors.New("floor5 error"); return }; _v.Floor5 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4cards"].(float64); !_ok_ { err = errors.New("floor4cards error"); return }; _v.Floor4cards = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5cards"].(float64); !_ok_ { err = errors.New("floor5cards error"); return }; _v.Floor5cards = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
@ -12,10 +12,12 @@ import "errors"
|
||||
|
||||
type Game_drawUpdrawData struct {
|
||||
Key int32
|
||||
Time int32
|
||||
Duration int32
|
||||
UpHero int32
|
||||
UpWeight int32
|
||||
TimeOn int32
|
||||
TimeOff int32
|
||||
UpHero []int32
|
||||
UpWeight []int32
|
||||
TriggerNum int32
|
||||
IncreaseWeight []int32
|
||||
}
|
||||
|
||||
func (Game_drawUpdrawData) GetTypeId() int {
|
||||
@ -25,9 +27,50 @@ func (Game_drawUpdrawData) GetTypeId() int {
|
||||
func NewGame_drawUpdrawData(_buf map[string]interface{}) (_v *Game_drawUpdrawData, err error) {
|
||||
_v = &Game_drawUpdrawData{}
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration"].(float64); !_ok_ { err = errors.New("duration error"); return }; _v.Duration = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["up_hero"].(float64); !_ok_ { err = errors.New("up_hero error"); return }; _v.UpHero = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["up_weight"].(float64); !_ok_ { err = errors.New("up_weight error"); return }; _v.UpWeight = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time_on"].(float64); !_ok_ { err = errors.New("time_on error"); return }; _v.TimeOn = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time_off"].(float64); !_ok_ { err = errors.New("time_off error"); return }; _v.TimeOff = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["up_hero"].([]interface{}); !_ok_ { err = errors.New("up_hero error"); return }
|
||||
|
||||
_v.UpHero = 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.UpHero = append(_v.UpHero, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["up_weight"].([]interface{}); !_ok_ { err = errors.New("up_weight error"); return }
|
||||
|
||||
_v.UpWeight = 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.UpWeight = append(_v.UpWeight, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_num"].(float64); !_ok_ { err = errors.New("trigger_num error"); return }; _v.TriggerNum = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["Increase_weight"].([]interface{}); !_ok_ { err = errors.New("Increase_weight error"); return }
|
||||
|
||||
_v.IncreaseWeight = 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.IncreaseWeight = append(_v.IncreaseWeight, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@ type Game_equipData struct {
|
||||
Addattrnum []int32
|
||||
Addattrnump []int32
|
||||
Addlibrary int32
|
||||
Ico string
|
||||
}
|
||||
|
||||
func (Game_equipData) GetTypeId() int {
|
||||
@ -63,5 +64,6 @@ func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err err
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["addlibrary"].(float64); !_ok_ { err = errors.New("addlibrary error"); return }; _v.Addlibrary = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ type Game_equipSuitData struct {
|
||||
Suittype int32
|
||||
Suitnum int32
|
||||
Skill int32
|
||||
Skillname string
|
||||
Skillintr string
|
||||
}
|
||||
|
||||
@ -26,6 +27,7 @@ func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData,
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Skillname, _ok_ = _buf["skillname"].(string); !_ok_ { err = errors.New("skillname error"); return } }
|
||||
{ var _ok_ bool; if _v.Skillintr, _ok_ = _buf["skillintr"].(string); !_ok_ { err = errors.New("skillintr error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ type Game_newHeroData struct {
|
||||
Race int32
|
||||
Job int32
|
||||
Type int32
|
||||
Prefab string
|
||||
Prefab int32
|
||||
Icon int32
|
||||
Sound string
|
||||
Tujing []int32
|
||||
@ -32,6 +32,7 @@ type Game_newHeroData struct {
|
||||
Skill1 int32
|
||||
Skill2 int32
|
||||
Skill3 int32
|
||||
Txt string
|
||||
}
|
||||
|
||||
func (Game_newHeroData) GetTypeId() int {
|
||||
@ -47,7 +48,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{
|
||||
@ -93,5 +94,6 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ type Game_shopData struct {
|
||||
Shopid int32
|
||||
Tab int32
|
||||
Shopname string
|
||||
UpperShop string
|
||||
Needshow []*Game_atn
|
||||
Rtype int32
|
||||
Rtime int32
|
||||
@ -31,6 +32,7 @@ func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopid"].(float64); !_ok_ { err = errors.New("shopid error"); return }; _v.Shopid = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Shopname, _ok_ = _buf["shopname"].(string); !_ok_ { err = errors.New("shopname error"); return } }
|
||||
{ var _ok_ bool; if _v.UpperShop, _ok_ = _buf["upper_shop"].(string); !_ok_ { err = errors.New("upper_shop error"); return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
|
||||
Loading…
Reference in New Issue
Block a user