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:
wh_zcy 2023-06-26 14:51:08 +08:00
commit b206bc1b38
24 changed files with 1421 additions and 1568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
bin/json/game_buriedcondi.json
View File

@ -11102,7 +11102,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_483", "key": "buried_buried_condi_tasktxt_483",
"text": "武馆派遣{0}次" "text": "武馆功夫陪练{0}次"
}, },
"type": 186, "type": 186,
"valid": 0, "valid": 0,
@ -11124,7 +11124,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_484", "key": "buried_buried_condi_tasktxt_484",
"text": "武馆派遣{0}次" "text": "武馆功夫陪练{0}次"
}, },
"type": 186, "type": 186,
"valid": 0, "valid": 0,
@ -11196,7 +11196,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_487", "key": "buried_buried_condi_tasktxt_487",
"text": "武馆派遣{0}次" "text": "武馆功夫陪练{0}次"
}, },
"type": 186, "type": 186,
"valid": 0, "valid": 0,
@ -16830,7 +16830,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_720", "key": "buried_buried_condi_tasktxt_720",
"text": "武馆派遣{0}次" "text": "武馆功夫陪练{0}次"
}, },
"type": 186, "type": 186,
"valid": 0, "valid": 0,
@ -16900,7 +16900,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_723", "key": "buried_buried_condi_tasktxt_723",
"text": "击退恐惧灵小怪" "text": "击退豺狼小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -17160,14 +17160,14 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_734", "key": "buried_buried_condi_tasktxt_734",
"text": "给阿宝穿5件装备" "text": "给骇客蛛穿5件装备"
}, },
"type": 5, "type": 5,
"valid": 0, "valid": 0,
"NPC": -102, "NPC": -102,
"value": 5, "value": 5,
"filter": [ "filter": [
25001 44004
], ],
"filter2": [ "filter2": [
"英雄ID", "英雄ID",
@ -17373,7 +17373,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_743", "key": "buried_buried_condi_tasktxt_743",
"text": "S" "text": "击退豺狼小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -17397,7 +17397,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_744", "key": "buried_buried_condi_tasktxt_744",
"text": "和梦魇对决" "text": "和漆黑对决"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18020,7 +18020,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_770", "key": "buried_buried_condi_tasktxt_770",
"text": "战斗16" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18044,7 +18044,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_771", "key": "buried_buried_condi_tasktxt_771",
"text": "维京远征2难度1" "text": "冰霜泰坦难度1"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18093,7 +18093,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_773", "key": "buried_buried_condi_tasktxt_773",
"text": "强化装备" "text": "6件装备+6"
}, },
"type": 43, "type": 43,
"valid": 0, "valid": 0,
@ -18117,7 +18117,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_774", "key": "buried_buried_condi_tasktxt_774",
"text": "主线【3-1】-【3-4】" "text": "冒险3-4通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18141,7 +18141,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_775", "key": "buried_buried_condi_tasktxt_775",
"text": "装备副本2难度2刷1次" "text": "冰霜泰坦难度2"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18166,7 +18166,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_776", "key": "buried_buried_condi_tasktxt_776",
"text": "主线【3-5】-【3-8】" "text": "冒险3-8通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18262,7 +18262,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_780", "key": "buried_buried_condi_tasktxt_780",
"text": "战斗17" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18286,7 +18286,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_781", "key": "buried_buried_condi_tasktxt_781",
"text": "战斗18" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18310,7 +18310,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_782", "key": "buried_buried_condi_tasktxt_782",
"text": "战斗19" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18334,7 +18334,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_783", "key": "buried_buried_condi_tasktxt_783",
"text": "装备副本3难度1(开支线，打狩猎)" "text": "森林泰坦难度1"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18405,7 +18405,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_786", "key": "buried_buried_condi_tasktxt_786",
"text": "战斗20" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18429,7 +18429,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_787", "key": "buried_buried_condi_tasktxt_787",
"text": "战斗21" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18477,7 +18477,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_789", "key": "buried_buried_condi_tasktxt_789",
"text": "主线【4-1】-【4-8】" "text": "冒险4-8通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18501,7 +18501,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_790", "key": "buried_buried_condi_tasktxt_790",
"text": "装备副本D 3难度4刷1次" "text": "森林泰坦难度2"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18509,7 +18509,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
4 2
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -18596,7 +18596,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_794", "key": "buried_buried_condi_tasktxt_794",
"text": "关卡【5-1】-【5-8】" "text": "冒险5-8通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18620,7 +18620,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_795", "key": "buried_buried_condi_tasktxt_795",
"text": "战斗22" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18644,7 +18644,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_796", "key": "buried_buried_condi_tasktxt_796",
"text": "战斗23" "text": "击退豺狼人"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -18668,7 +18668,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_797", "key": "buried_buried_condi_tasktxt_797",
"text": "穿一套+6的无极神功套装" "text": "穿+6的无极神功套装"
}, },
"type": 93, "type": 93,
"valid": 0, "valid": 0,
@ -18693,7 +18693,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_798", "key": "buried_buried_condi_tasktxt_798",
"text": "加入公会" "text": "加入任意公会"
}, },
"type": 109, "type": 109,
"valid": 0, "valid": 0,
@ -18715,7 +18715,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_799", "key": "buried_buried_condi_tasktxt_799",
"text": "装备副本D 3难度2刷1次" "text": "森林泰坦难度3"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18723,7 +18723,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
2 3
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -18740,7 +18740,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_800", "key": "buried_buried_condi_tasktxt_800",
"text": "装备副本D 3难度5刷2次" "text": "森林泰坦难度4"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18748,7 +18748,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
5 4
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -18809,7 +18809,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_803", "key": "buried_buried_condi_tasktxt_803",
"text": "关卡6-6" "text": "冒险6-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18857,7 +18857,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_805", "key": "buried_buried_condi_tasktxt_805",
"text": "竞技场3连胜" "text": "竞技场3胜"
}, },
"type": 131, "type": 131,
"valid": 0, "valid": 0,
@ -18879,7 +18879,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_806", "key": "buried_buried_condi_tasktxt_806",
"text": "装备副本boss3难度6刷1次" "text": "森林泰坦难度5"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -18887,7 +18887,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
6 5
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -18926,7 +18926,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_808", "key": "buried_buried_condi_tasktxt_808",
"text": "关卡7-6" "text": "冒险7-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -18998,7 +18998,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_811", "key": "buried_buried_condi_tasktxt_811",
"text": "关卡8-6" "text": "冒险8-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19022,7 +19022,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_812", "key": "buried_buried_condi_tasktxt_812",
"text": "装备副本boss3难度7刷1次" "text": "森林泰坦难度6"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -19030,7 +19030,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
7 6
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -19071,7 +19071,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_814", "key": "buried_buried_condi_tasktxt_814",
"text": "关卡9-6" "text": "冒险9-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19117,7 +19117,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_816", "key": "buried_buried_condi_tasktxt_816",
"text": "关卡10-6" "text": "冒险10-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19141,7 +19141,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_817", "key": "buried_buried_condi_tasktxt_817",
"text": "装备副本boss3难度8刷1次" "text": "森林泰坦难度7"
}, },
"type": 73, "type": 73,
"valid": 0, "valid": 0,
@ -19149,7 +19149,7 @@
"value": 1, "value": 1,
"filter": [ "filter": [
3, 3,
8 7
], ],
"filter2": [ "filter2": [
"boss类型", "boss类型",
@ -19190,7 +19190,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_819", "key": "buried_buried_condi_tasktxt_819",
"text": "关卡11-6" "text": "冒险11-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19236,7 +19236,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_821", "key": "buried_buried_condi_tasktxt_821",
"text": "关卡12-6" "text": "冒险12-6通关"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19260,7 +19260,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_822", "key": "buried_buried_condi_tasktxt_822",
"text": "主线困难1-3" "text": "冒险关卡困难1-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19284,7 +19284,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_823", "key": "buried_buried_condi_tasktxt_823",
"text": "主线困难1-6" "text": "冒险关卡困难1-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19308,7 +19308,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_824", "key": "buried_buried_condi_tasktxt_824",
"text": "主线困难2-3" "text": "冒险关卡困难2-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19332,7 +19332,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_825", "key": "buried_buried_condi_tasktxt_825",
"text": "主线困难2-6" "text": "冒险关卡困难2-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19356,7 +19356,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_826", "key": "buried_buried_condi_tasktxt_826",
"text": "主线困难3-3" "text": "冒险关卡困难3-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19380,7 +19380,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_827", "key": "buried_buried_condi_tasktxt_827",
"text": "主线困难3-6" "text": "冒险关卡困难3-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19404,7 +19404,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_828", "key": "buried_buried_condi_tasktxt_828",
"text": "主线困难4-3" "text": "冒险关卡困难4-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19428,7 +19428,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_829", "key": "buried_buried_condi_tasktxt_829",
"text": "主线困难4-6" "text": "冒险关卡困难4-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19452,7 +19452,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_830", "key": "buried_buried_condi_tasktxt_830",
"text": "主线困难5-3" "text": "冒险关卡困难5-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19476,7 +19476,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_831", "key": "buried_buried_condi_tasktxt_831",
"text": "主线困难5-6" "text": "冒险关卡困难5-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19500,7 +19500,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_832", "key": "buried_buried_condi_tasktxt_832",
"text": "主线困难6-3" "text": "冒险关卡困难6-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19524,7 +19524,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_833", "key": "buried_buried_condi_tasktxt_833",
"text": "主线困难6-6" "text": "冒险关卡困难6-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19548,7 +19548,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_834", "key": "buried_buried_condi_tasktxt_834",
"text": "主线困难7-3" "text": "冒险关卡困难7-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19572,7 +19572,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_835", "key": "buried_buried_condi_tasktxt_835",
"text": "主线困难7-6" "text": "冒险关卡困难7-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19596,7 +19596,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_836", "key": "buried_buried_condi_tasktxt_836",
"text": "主线困难8-3" "text": "冒险关卡困难8-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19620,7 +19620,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_837", "key": "buried_buried_condi_tasktxt_837",
"text": "主线困难8-6" "text": "冒险关卡困难8-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19644,7 +19644,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_838", "key": "buried_buried_condi_tasktxt_838",
"text": "主线困难9-3" "text": "冒险关卡困难9-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19668,7 +19668,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_839", "key": "buried_buried_condi_tasktxt_839",
"text": "主线困难9-6" "text": "冒险关卡困难9-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19692,7 +19692,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_840", "key": "buried_buried_condi_tasktxt_840",
"text": "主线困难10-3" "text": "冒险关卡困难10-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19716,7 +19716,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_841", "key": "buried_buried_condi_tasktxt_841",
"text": "主线困难10-6" "text": "冒险关卡困难10-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19740,7 +19740,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_842", "key": "buried_buried_condi_tasktxt_842",
"text": "主线困难11-3" "text": "冒险关卡困难11-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19764,7 +19764,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_843", "key": "buried_buried_condi_tasktxt_843",
"text": "主线困难11-6" "text": "冒险关卡困难11-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19788,7 +19788,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_844", "key": "buried_buried_condi_tasktxt_844",
"text": "主线困难12-3" "text": "冒险关卡困难12-3"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19812,7 +19812,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_845", "key": "buried_buried_condi_tasktxt_845",
"text": "主线困难12-6" "text": "冒险关卡困难12-6"
}, },
"type": 61, "type": 61,
"valid": 0, "valid": 0,
@ -19836,7 +19836,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_846", "key": "buried_buried_condi_tasktxt_846",
"text": "本周竞技场挑战{1}次" "text": "本周竞技场挑战{0}次"
}, },
"type": 130, "type": 130,
"valid": 10, "valid": 10,
@ -19853,7 +19853,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_847", "key": "buried_buried_condi_tasktxt_847",
"text": "本周竞技场挑战{1}次" "text": "本周竞技场挑战{0}次"
}, },
"type": 130, "type": 130,
"valid": 30, "valid": 30,
@ -19870,7 +19870,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_848", "key": "buried_buried_condi_tasktxt_848",
"text": "本周竞技场挑战{1}次" "text": "本周竞技场挑战{0}次"
}, },
"type": 130, "type": 130,
"valid": 50, "valid": 50,
@ -19887,7 +19887,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_849", "key": "buried_buried_condi_tasktxt_849",
"text": "本周竞技场胜利{1}次" "text": "本周竞技场胜利{0}次"
}, },
"type": 130, "type": 130,
"valid": 10, "valid": 10,
@ -19904,7 +19904,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_850", "key": "buried_buried_condi_tasktxt_850",
"text": "本周竞技场胜利{1}次" "text": "本周竞技场胜利{0}次"
}, },
"type": 130, "type": 130,
"valid": 20, "valid": 20,
@ -19921,7 +19921,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_851", "key": "buried_buried_condi_tasktxt_851",
"text": "本周竞技场胜利{1}次" "text": "本周竞技场胜利{0}次"
}, },
"type": 130, "type": 130,
"valid": 30, "valid": 30,
@ -19938,7 +19938,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_852", "key": "buried_buried_condi_tasktxt_852",
"text": "本周累计经验副本消耗{1}体力" "text": "本周累计经验副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 300, "valid": 300,
@ -19955,7 +19955,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_853", "key": "buried_buried_condi_tasktxt_853",
"text": "本周累计经验副本消耗{1}体力" "text": "本周累计经验副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 600, "valid": 600,
@ -19972,7 +19972,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_854", "key": "buried_buried_condi_tasktxt_854",
"text": "本周累计经验副本消耗{1}体力" "text": "本周累计经验副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 1000, "valid": 1000,
@ -19989,7 +19989,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_855", "key": "buried_buried_condi_tasktxt_855",
"text": "本周累计消耗{1}点金币" "text": "本周累计消耗{0}点金币"
}, },
"type": 130, "type": 130,
"valid": 3000000, "valid": 3000000,
@ -20006,7 +20006,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_856", "key": "buried_buried_condi_tasktxt_856",
"text": "本周累计消耗{1}点金币" "text": "本周累计消耗{0}点金币"
}, },
"type": 130, "type": 130,
"valid": 6000000, "valid": 6000000,
@ -20023,7 +20023,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_857", "key": "buried_buried_condi_tasktxt_857",
"text": "本周累计消耗{1}点金币" "text": "本周累计消耗{0}点金币"
}, },
"type": 130, "type": 130,
"valid": 10000000, "valid": 10000000,
@ -20040,7 +20040,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_858", "key": "buried_buried_condi_tasktxt_858",
"text": "本周累计装备副本消耗{1}体力" "text": "本周累计装备副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 300, "valid": 300,
@ -20057,7 +20057,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_859", "key": "buried_buried_condi_tasktxt_859",
"text": "本周累计装备副本消耗{1}体力" "text": "本周累计装备副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 600, "valid": 600,
@ -20074,7 +20074,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_860", "key": "buried_buried_condi_tasktxt_860",
"text": "本周累计装备副本消耗{1}体力" "text": "本周累计装备副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 1000, "valid": 1000,
@ -20091,7 +20091,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_861", "key": "buried_buried_condi_tasktxt_861",
"text": "本周累计回响副本消耗{1}体力" "text": "本周累计回响副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 300, "valid": 300,
@ -20108,7 +20108,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_862", "key": "buried_buried_condi_tasktxt_862",
"text": "本周累计回响副本消耗{1}体力" "text": "本周累计回响副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 600, "valid": 600,
@ -20125,7 +20125,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_863", "key": "buried_buried_condi_tasktxt_863",
"text": "本周累计回响副本消耗{1}体力" "text": "本周累计回响副本消耗{0}体力"
}, },
"type": 130, "type": 130,
"valid": 1000, "valid": 1000,

2
bin/json/game_guildtask.json
View File

@ -209,7 +209,7 @@
"jump_interface": 10006, "jump_interface": 10006,
"task_display": { "task_display": {
"key": "guild_guild_task_task_display_7", "key": "guild_guild_task_task_display_7",
"text": "完成1次功夫派遣任务" "text": "完成1次功夫陪练任务"
}, },
"reward": [ "reward": [
{ {

4
bin/json/game_itemlink.json
View File

@ -224,11 +224,11 @@
"id": 10006, "id": 10006,
"title": { "title": {
"key": "itemlink_itemlink_title_18", "key": "itemlink_itemlink_title_18",
"text": "熊猫武馆-NPC派遣" "text": "熊猫武馆-功夫陪练"
}, },
"desc": { "desc": {
"key": "itemlink_itemlink_desc_18", "key": "itemlink_itemlink_desc_18",
"text": "熊猫武馆派遣" "text": "熊猫武馆功夫陪练"
}, },
"jumpid": 10006, "jumpid": 10006,
"icon": "ty_qp_gsb" "icon": "ty_qp_gsb"

44
bin/json/game_opencond.json
View File

@ -559,8 +559,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100608
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -858,8 +858,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100508
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1231,7 +1231,7 @@
}, },
{ {
"key": 2, "key": 2,
"param": 1101208 "param": 1100408
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1368,8 +1368,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100107
} }
], ],
"wkqbx": 1, "wkqbx": 1,
@ -1483,8 +1483,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100208
} }
], ],
"wkqbx": 1, "wkqbx": 1,
@ -1604,8 +1604,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100204
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1678,7 +1678,7 @@
}, },
{ {
"key": 2, "key": 2,
"param": 1201208 "param": 1100808
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1727,8 +1727,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100208
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1750,8 +1750,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100504
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1773,8 +1773,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100504
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1796,8 +1796,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100604
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1819,8 +1819,8 @@
}, },
"main": [ "main": [
{ {
"key": 1, "key": 2,
"param": 1 "param": 1100608
} }
], ],
"wkqbx": 0, "wkqbx": 0,

8
bin/json/game_paypackage.json
View File

@ -344,7 +344,7 @@
"key": "paypackage_paypackage_pagename_12", "key": "paypackage_paypackage_pagename_12",
"text": "每周礼包7" "text": "每周礼包7"
}, },
"packagetype": "week_7", "packagetype": "week_6",
"buy_num": 999, "buy_num": 999,
"packagename": { "packagename": {
"key": "paypackage_paypackage_packagename_12", "key": "paypackage_paypackage_packagename_12",
@ -376,7 +376,7 @@
"key": "paypackage_paypackage_pagename_13", "key": "paypackage_paypackage_pagename_13",
"text": "每月礼包1" "text": "每月礼包1"
}, },
"packagetype": "month_1", "packagetype": "month_2",
"buy_num": 5, "buy_num": 5,
"packagename": { "packagename": {
"key": "paypackage_paypackage_packagename_13", "key": "paypackage_paypackage_packagename_13",
@ -430,7 +430,7 @@
"key": "paypackage_paypackage_pagename_15", "key": "paypackage_paypackage_pagename_15",
"text": "每月礼包3" "text": "每月礼包3"
}, },
"packagetype": "month_3", "packagetype": "month_2",
"buy_num": 5, "buy_num": 5,
"packagename": { "packagename": {
"key": "paypackage_paypackage_packagename_15", "key": "paypackage_paypackage_packagename_15",
@ -457,7 +457,7 @@
"key": "paypackage_paypackage_pagename_16", "key": "paypackage_paypackage_pagename_16",
"text": "每月礼包4" "text": "每月礼包4"
}, },
"packagetype": "month_4", "packagetype": "month_2",
"buy_num": 5, "buy_num": 5,
"packagename": { "packagename": {
"key": "paypackage_paypackage_packagename_16", "key": "paypackage_paypackage_packagename_16",

1613
bin/json/game_rdtasknpc.json
View File

File diff suppressed because it is too large Load Diff

369
bin/json/game_recharge.json
View File

@ -9,29 +9,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 60
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 6000 "n": 60
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 60
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 12000 "n": 30
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$6", "show": "6元",
"image": "cz_zs_01" "image": "cz_zs_01"
}, },
{ {
@ -44,29 +44,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 300
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 30000 "n": 300
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 300
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 60000 "n": 150
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "30元",
"image": "cz_zs_02" "image": "cz_zs_02"
}, },
{ {
@ -79,29 +79,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 68000 "n": 680
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 68000 "n": 680
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 68000 "n": 680
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 136000 "n": 340
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$68", "show": "68元",
"image": "cz_zs_02" "image": "cz_zs_02"
}, },
{ {
@ -114,29 +114,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 98000 "n": 980
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 98000 "n": 980
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 98000 "n": 980
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 196000 "n": 490
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$98", "show": "98元",
"image": "cz_zs_02" "image": "cz_zs_02"
}, },
{ {
@ -149,29 +149,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 128000 "n": 1280
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 128000 "n": 1280
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 128000 "n": 1280
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 256000 "n": 640
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$128", "show": "128元",
"image": "cz_zs_03" "image": "cz_zs_03"
}, },
{ {
@ -184,29 +184,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 198000 "n": 1980
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 198000 "n": 1980
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 198000 "n": 1980
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 396000 "n": 990
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$198", "show": "198元",
"image": "cz_zs_03" "image": "cz_zs_03"
}, },
{ {
@ -219,29 +219,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 328000 "n": 3280
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 328000 "n": 3280
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 328000 "n": 3280
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 656000 "n": 1640
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$328", "show": "328元",
"image": "cz_zs_03" "image": "cz_zs_03"
}, },
{ {
@ -254,29 +254,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 648000 "n": 6480
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 648000 "n": 6480
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 648000 "n": 6480
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 1296000 "n": 3240
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$648", "show": "648元",
"image": "cz_zs_03" "image": "cz_zs_03"
}, },
{ {
@ -289,29 +289,29 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 60
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 6000 "n": 60
} }
], ],
"diamond_num_double": [ "diamond_num_double": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 60
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 12000 "n": 30
} }
], ],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$6", "show": "6元",
"image": "" "image": ""
}, },
{ {
@ -324,29 +324,13 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 6000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
},
{
"a": "attr",
"t": "diamond",
"n": 12000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$6", "show": "6元",
"image": "" "image": ""
}, },
{ {
@ -354,34 +338,56 @@
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
"amount": 600, "amount": 3000,
"vipexp": [ "vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 300
},
{
"a": "attr",
"t": "diamond",
"n": 6000
} }
], ],
"diamond_num_double": [ "diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "30元",
"image": ""
},
{
"id": "day_3",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "￥",
"amount": 6800,
"vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 6000 "n": 680
},
{
"a": "attr",
"t": "diamond",
"n": 12000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$6", "show": "68元",
"image": ""
},
{
"id": "day_4",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "￥",
"amount": 12800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 1280
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "128元",
"image": "" "image": ""
}, },
{ {
@ -394,29 +400,13 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 300
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "30元",
"image": "" "image": ""
}, },
{ {
@ -424,34 +414,18 @@
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
"amount": 3000, "amount": 9800,
"vipexp": [ "vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 980
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "98元",
"image": "" "image": ""
}, },
{ {
@ -459,34 +433,18 @@
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
"amount": 3000, "amount": 19800,
"vipexp": [ "vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 1980
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "198元",
"image": "" "image": ""
}, },
{ {
@ -494,34 +452,18 @@
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
"amount": 3000, "amount": 32800,
"vipexp": [ "vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 3280
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "328元",
"image": "" "image": ""
}, },
{ {
@ -529,34 +471,37 @@
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
"amount": 3000, "amount": 44800,
"vipexp": [ "vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 4480
},
{
"a": "attr",
"t": "diamond",
"n": 30000
} }
], ],
"diamond_num_double": [ "diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "448元",
"image": ""
},
{
"id": "week_6",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "￥",
"amount": 64800,
"vipexp": [
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 6480
},
{
"a": "attr",
"t": "diamond",
"n": 60000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "648元",
"image": "" "image": ""
}, },
{ {
@ -569,29 +514,13 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 128000 "n": 1280
},
{
"a": "attr",
"t": "diamond",
"n": 128000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 128000
},
{
"a": "attr",
"t": "diamond",
"n": 256000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$128", "show": "128元",
"image": "" "image": ""
}, },
{ {
@ -604,29 +533,13 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 198000 "n": 1980
},
{
"a": "attr",
"t": "diamond",
"n": 198000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 198000
},
{
"a": "attr",
"t": "diamond",
"n": 396000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$198", "show": "198元",
"image": "" "image": ""
}, },
{ {
@ -639,29 +552,13 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 328000 "n": 3280
},
{
"a": "attr",
"t": "diamond",
"n": 328000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 328000
},
{
"a": "attr",
"t": "diamond",
"n": 656000
} }
], ],
"diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$328", "show": "328元",
"image": "" "image": ""
}, },
{ {
@ -674,18 +571,18 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 30000 "n": 300
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 30000 "n": 300
} }
], ],
"diamond_num_double": [], "diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$30", "show": "30元",
"image": "" "image": ""
}, },
{ {
@ -698,18 +595,18 @@
{ {
"a": "attr", "a": "attr",
"t": "vipexp", "t": "vipexp",
"n": 98000 "n": 980
}, },
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 98000 "n": 980
} }
], ],
"diamond_num_double": [], "diamond_num_double": [],
"channel": "0", "channel": "0",
"text": "0", "text": "0",
"show": "$98", "show": "98元",
"image": "" "image": ""
} }
] ]

11
bin/json/game_ruledesc.json
View File

@ -471,5 +471,16 @@
"key": "ruledesc_ruledesc_content_43", "key": "ruledesc_ruledesc_content_43",
"text": "帮忙测试这个界面是否有帮助信息。" "text": "帮忙测试这个界面是否有帮助信息。"
} }
},
{
"id": 10044,
"title": {
"key": "ruledesc_ruledesc_title_44",
"text": "主角个人信息界面说明"
},
"content": {
"key": "ruledesc_ruledesc_content_44",
"text": "这里可以查看玩家游戏进度，并且可以修改名称与个性签名（名称最多20字符，汉字算2字符），更改角色装扮，还能修改并查看自己的阵容展示。"
}
} }
] ]

18
bin/json/game_shop.json
View File

@ -22,7 +22,7 @@
"n": 1 "n": 1
} }
], ],
"rtype": 1, "rtype": 2,
"rtime": 6, "rtime": 6,
"rnum": 8, "rnum": 8,
"rneed": [ "rneed": [
@ -135,8 +135,8 @@
"n": 1 "n": 1
} }
], ],
"rtype": 3, "rtype": 2,
"rtime": 1, "rtime": 7,
"rnum": -1, "rnum": -1,
"rneed": [], "rneed": [],
"shopitem": [ "shopitem": [
@ -172,8 +172,8 @@
"n": 1 "n": 1
} }
], ],
"rtype": 3, "rtype": 2,
"rtime": 1, "rtime": 7,
"rnum": -1, "rnum": -1,
"rneed": [], "rneed": [],
"shopitem": [ "shopitem": [
@ -203,8 +203,8 @@
"n": 1 "n": 1
} }
], ],
"rtype": 4, "rtype": 2,
"rtime": 1, "rtime": 21,
"rnum": -1, "rnum": -1,
"rneed": [], "rneed": [],
"shopitem": [ "shopitem": [
@ -237,8 +237,8 @@
"n": 1 "n": 1
} }
], ],
"rtype": 3, "rtype": 2,
"rtime": 1, "rtime": 7,
"rnum": -1, "rnum": -1,
"rneed": [], "rneed": [],
"shopitem": [ "shopitem": [

12
bin/json/game_skillafteratk.json
View File

@ -10040,7 +10040,7 @@
"Argu": [ "Argu": [
414007211, 414007211,
-1, -1,
-1 9999
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -16928,7 +16928,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -16951,7 +16951,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3100
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -16974,7 +16974,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3200
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -16997,7 +16997,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -17020,7 +17020,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3500
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],

2
bin/json/game_skillatk.json
View File

@ -12196,7 +12196,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113002311_1", "key": "skill_skill_atk_Desc_113002311_1",
"text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。" "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""

10
bin/json/game_skillbuff.json
View File

@ -994,7 +994,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
1, 1,
1, 2,
100 100
], ],
"BufParNum": 1, "BufParNum": 1,
@ -1026,7 +1026,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
1, 1,
1, 2,
50 50
], ],
"BufParNum": 1, "BufParNum": 1,
@ -1086,7 +1086,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
2, 2,
1, 2,
500 500
], ],
"BufParNum": 1, "BufParNum": 1,
@ -1238,7 +1238,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
1, 1,
1, 2,
500 500
], ],
"BufParNum": 1, "BufParNum": 1,
@ -3587,7 +3587,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
1, 1,
1, 2,
220 220
], ],
"BufParNum": 1, "BufParNum": 1,

410
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

2
comm/imodule.go
View File

@ -55,7 +55,7 @@ type (
///添加单个物品到背包 (可以加物品和减物品) ///添加单个物品到背包 (可以加物品和减物品)
AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData)
///添加多个物品到背包 (可以加物品和减物品) ///添加多个物品到背包 (可以加物品和减物品)
AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData)
///清理道具 ///清理道具
CleanItems(session IUserSession) (errdata *pb.ErrorData) CleanItems(session IUserSession) (errdata *pb.ErrorData)
///购买统一入场券 ///购买统一入场券

8
modules/equipment/api_wash.go
View File

@ -64,14 +64,18 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
} }
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry)) adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
for i, v := range comm.RandShuffle(len(equip.AdverbEntry)) { for i, v := range comm.RandShuffle(len(attrlibrarys)) {
if i < len(equip.AdverbEntry) {
adverbEntry[i] = &pb.EquipmentAttributeEntry{ adverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrarys[v].Key, Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid, Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.AdverbEntry[i].Lv, Lv: equip.AdverbEntry[i].Lv,
AttrName: attrlibrarys[v].Attrkey, AttrName: attrlibrarys[v].Attrkey,
BaseValue: attrlibrarys[v].Attrvar, BaseValue: attrlibrarys[v].Attrvar,
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].AttrvarCorrect)), Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)),
}
} else {
break
} }
} }
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1)

6
modules/items/modelitems.go
View File

@ -390,10 +390,12 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
num = int64(v.Amount) + int64(leftnum) num = int64(v.Amount) + int64(leftnum)
if num < 0 { if num < 0 {
leftnum += int64(v.Amount) leftnum += int64(v.Amount)
v.Change = -1 * int32(v.Amount)
v.Amount = 0 v.Amount = 0
del = append(del, v) del = append(del, v)
} else if num > 0 && num < int64(v.Amount) { } else if num > 0 && num < int64(v.Amount) {
leftnum = 0 leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num) v.Amount = uint32(num)
update = append(update, v) update = append(update, v)
break break
@ -401,6 +403,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
if conf.UpperLimit > 0 { if conf.UpperLimit > 0 {
if num <= int64(conf.UpperLimit) { if num <= int64(conf.UpperLimit) {
leftnum = 0 leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num) v.Amount = uint32(num)
update = append(update, v) update = append(update, v)
break break
@ -413,6 +416,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
} }
} else { } else {
leftnum = 0 leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num) v.Amount = uint32(num)
update = append(update, v) update = append(update, v)
} }
@ -434,6 +438,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
GridId: primitive.NewObjectID().Hex(), GridId: primitive.NewObjectID().Hex(),
UId: uid, UId: uid,
ItemId: itemId, ItemId: itemId,
Change: int32(leftnum),
Amount: uint32(leftnum), Amount: uint32(leftnum),
CTime: configure.Now().Unix(), CTime: configure.Now().Unix(),
IsNewItem: isNew, IsNewItem: isNew,
@ -451,6 +456,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
GridId: primitive.NewObjectID().Hex(), GridId: primitive.NewObjectID().Hex(),
UId: uid, UId: uid,
ItemId: itemId, ItemId: itemId,
Change: int32(conf.UpperLimit),
Amount: uint32(conf.UpperLimit), Amount: uint32(conf.UpperLimit),
CTime: configure.Now().Unix(), CTime: configure.Now().Unix(),
IsNewItem: isNew, IsNewItem: isNew,

52
modules/items/module.go
View File

@ -34,19 +34,19 @@ type Items struct {
configure *ConfigureComp configure *ConfigureComp
} }
//模块名称 // 模块名称
func (this *Items) GetType() core.M_Modules { func (this *Items) GetType() core.M_Modules {
return comm.ModuleItems return comm.ModuleItems
} }
//模块初始化接口 注册用户创建角色事件 // 模块初始化接口 注册用户创建角色事件
func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options) err = this.ModuleBase.Init(service, module, options)
this.service = service.(base.IRPCXService) this.service = service.(base.IRPCXService)
return return
} }
//模块启动 // 模块启动
func (this *Items) Start() (err error) { func (this *Items) Start() (err error) {
err = this.ModuleBase.Start() err = this.ModuleBase.Start()
var module core.IModule var module core.IModule
@ -58,7 +58,7 @@ func (this *Items) Start() (err error) {
return return
} }
//装备组件 // 装备组件
func (this *Items) OnInstallComp() { func (this *Items) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.api = this.RegisterComp(new(apiComp)).(*apiComp)
@ -66,13 +66,13 @@ func (this *Items) OnInstallComp() {
this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp) this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp)
} }
//Event------------------------------------------------------------------------------------------------------------ // Event------------------------------------------------------------------------------------------------------------
func (this *Items) EventUserOffline(uid, sessionid string) { func (this *Items) EventUserOffline(uid, sessionid string) {
this.modelItems.BatchDelLists(uid) this.modelItems.BatchDelLists(uid)
} }
//IItems------------------------------------------------------------------------------------------------------------------------------- // IItems-------------------------------------------------------------------------------------------------------------------------------
///查询用户背包物品数量 // /查询用户背包物品数量
func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) { func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) {
defer this.Debugf("获取物品 uId:%s itemid:%s addnum:%d ", uId, itemid, amount) defer this.Debugf("获取物品 uId:%s itemid:%s addnum:%d ", uId, itemid, amount)
amount = 0 amount = 0
@ -82,7 +82,7 @@ func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) {
return return
} }
///查询用户背包多个物品数量 // /查询用户背包多个物品数量
func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[string]uint32) { func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[string]uint32) {
result = this.modelItems.QueryUserPackItemsAmount(uId, itemid...) result = this.modelItems.QueryUserPackItemsAmount(uId, itemid...)
return return
@ -124,7 +124,7 @@ func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addn
return return
} }
///添加单个物品到背包 (可以加物品和减物品) // /添加单个物品到背包 (可以加物品和减物品)
func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) { func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -161,15 +161,17 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3
return return
} }
///添加多个物品到背包 (可以加物品和减物品) // /添加多个物品到背包 (可以加物品和减物品)
func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) { func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData) {
var ( var (
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
_change []*pb.DB_UserItemData
err error err error
) )
defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil) defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil { change = make([]*pb.UserAtno, 0)
if _change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err) this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err)
if err == ItemNotEnoughError { if err == ItemNotEnoughError {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -198,8 +200,16 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
} }
return return
} }
if len(change) > 0 && bPush { for _, v := range _change {
this.itemsChangePush(session, change) //推送道具背包变化 change = append(change, &pb.UserAtno{
A: comm.ItemType,
T: v.ItemId,
N: v.Change,
O: v.GridId,
})
}
if len(_change) > 0 && bPush {
this.itemsChangePush(session, _change) //推送道具背包变化
} }
for k, v := range items { for k, v := range items {
if v > 0 { if v > 0 {
@ -213,12 +223,12 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
return return
} }
//使用物品 // 使用物品
func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) { func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) {
return this.modelItems.useitem(session, gid, amount, slt) return this.modelItems.useitem(session, gid, amount, slt)
} }
//清理背包 // 清理背包
func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) { func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -236,19 +246,19 @@ func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData)
return return
} }
//购买门票道具 // 购买门票道具
func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) { func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) {
_, errdata = this.modelItems.buyTicket(session, buynum) _, errdata = this.modelItems.buyTicket(session, buynum)
return return
} }
//回复道具 // 回复道具
func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) { func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) {
errdata = this.modelItems.recoverTicket(session) errdata = this.modelItems.recoverTicket(session)
return return
} }
//出售道具 // 出售道具
func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) { func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
var ( var (
grids []string = make([]string, 0, len(items)) grids []string = make([]string, 0, len(items))
@ -334,8 +344,8 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b
return return
} }
//Evens-------------------------------------------------------------------------------------------------------------------------------- // Evens--------------------------------------------------------------------------------------------------------------------------------
//推送道具变化消息 // 推送道具变化消息
func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_UserItemData) (err error) { func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_UserItemData) (err error) {
session.SendMsg(string(this.GetType()), "change", &pb.ItemsChangePush{Grids: items}) session.SendMsg(string(this.GetType()), "change", &pb.ItemsChangePush{Grids: items})
return return

14
modules/modulebase.go
View File

@ -684,16 +684,10 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
} }
} }
if len(items) > 0 { //道具资源 if len(items) > 0 { //道具资源
addItems, code := this.ModuleItems.AddItems(session, items, bPush) _atno, code := this.ModuleItems.AddItems(session, items, bPush)
this.Debugf("发放道具资源: %v [%v]", items, code) errdata = code
for _, v := range addItems { atno = append(atno, _atno...)
atno = append(atno, &pb.UserAtno{ this.Debugf("发放道具资源: %v [%v]", _atno, code)
A: "item",
T: v.ItemId,
N: int32(len(items)),
O: v.GridId,
})
}
} }
if len(heros) > 0 { //卡片资源 if len(heros) > 0 { //卡片资源
hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush) hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush)

2
modules/viking/api_challengeover.go
View File

@ -140,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
res = append(res, v) res = append(res, v)
} }
} }
res = append(res, vikingCfg.Manexp...) //给玩家加经验
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return return
} }

139
pb/hero_db.pb.go
View File

@ -321,8 +321,8 @@ type DBHeroRecord struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id 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" bson:"uid"` //用户ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 -- 新版抽卡废弃字段 Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底
Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 -- 新版抽卡废弃字段 Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底
Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间 Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间
Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数
Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数
@ -334,9 +334,6 @@ type DBHeroRecord struct {
Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄 Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄
Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄 Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄
Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count
Baodi4 map[int32]int32 `protobuf:"bytes,16,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count
Baodi5 map[int32]int32 `protobuf:"bytes,17,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count
Count map[int32]int32 `protobuf:"bytes,18,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count
} }
func (x *DBHeroRecord) Reset() { func (x *DBHeroRecord) Reset() {
@ -476,27 +473,6 @@ func (x *DBHeroRecord) GetRace() map[int32]int32 {
return nil return nil
} }
func (x *DBHeroRecord) GetBaodi4() map[int32]int32 {
if x != nil {
return x.Baodi4
}
return nil
}
func (x *DBHeroRecord) GetBaodi5() map[int32]int32 {
if x != nil {
return x.Baodi5
}
return nil
}
func (x *DBHeroRecord) GetCount() map[int32]int32 {
if x != nil {
return x.Count
}
return nil
}
// 英雄天赋系统 // 英雄天赋系统
type DBHeroTalent struct { type DBHeroTalent struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -658,7 +634,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 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, 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, 0xde, 0x07, 0x0a, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c,
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 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, 0x14, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14,
@ -689,54 +665,33 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63,
0x65, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x10, 0x20, 0x03, 0x28, 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x6f, 0x64, 0x69, 0x34, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72,
0x6f, 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x12, 0x2e, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a,
0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01,
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0xb6, 0x01, 0x0a,
0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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,
0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e,
0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61,
0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70,
0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c,
0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f,
0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -752,7 +707,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
} }
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_hero_hero_db_proto_goTypes = []interface{}{ var file_hero_hero_db_proto_goTypes = []interface{}{
(HeroType)(0), // 0: HeroType (HeroType)(0), // 0: HeroType
(*DBHero)(nil), // 1: DBHero (*DBHero)(nil), // 1: DBHero
@ -767,36 +722,30 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
nil, // 10: DBHeroRecord.ConditionEntry nil, // 10: DBHeroRecord.ConditionEntry
nil, // 11: DBHeroRecord.Star5HeroEntry nil, // 11: DBHeroRecord.Star5HeroEntry
nil, // 12: DBHeroRecord.RaceEntry nil, // 12: DBHeroRecord.RaceEntry
nil, // 13: DBHeroRecord.Baodi4Entry nil, // 13: DBHeroTalent.TalentEntry
nil, // 14: DBHeroRecord.Baodi5Entry (*SkillData)(nil), // 14: SkillData
nil, // 15: DBHeroRecord.CountEntry (*DB_EquipmentSuit)(nil), // 15: DB_EquipmentSuit
nil, // 16: DBHeroTalent.TalentEntry
(*SkillData)(nil), // 17: SkillData
(*DB_EquipmentSuit)(nil), // 18: DB_EquipmentSuit
} }
var file_hero_hero_db_proto_depIdxs = []int32{ var file_hero_hero_db_proto_depIdxs = []int32{
17, // 0: DBHero.normalSkill:type_name -> SkillData 14, // 0: DBHero.normalSkill:type_name -> SkillData
4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry 4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry 5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry 6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
0, // 4: DBHero.status:type_name -> HeroType 0, // 4: DBHero.status:type_name -> HeroType
18, // 5: DBHero.suits:type_name -> DB_EquipmentSuit 15, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry 7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
17, // 7: DBHero.equipSkill:type_name -> SkillData 14, // 7: DBHero.equipSkill:type_name -> SkillData
8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry 8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry 9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry
10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry 10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry 11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry 12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry
13, // 13: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry 13, // 13: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
14, // 14: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry 14, // [14:14] is the sub-list for method output_type
15, // 15: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry 14, // [14:14] is the sub-list for method input_type
16, // 16: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry 14, // [14:14] is the sub-list for extension type_name
17, // [17:17] is the sub-list for method output_type 14, // [14:14] is the sub-list for extension extendee
17, // [17:17] is the sub-list for method input_type 0, // [0:14] is the sub-list for field type_name
17, // [17:17] is the sub-list for extension type_name
17, // [17:17] is the sub-list for extension extendee
0, // [0:17] is the sub-list for field type_name
} }
func init() { file_hero_hero_db_proto_init() } func init() { file_hero_hero_db_proto_init() }
@ -850,7 +799,7 @@ func file_hero_hero_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_db_proto_rawDesc, RawDescriptor: file_hero_hero_db_proto_rawDesc,
NumEnums: 1, NumEnums: 1,
NumMessages: 16, NumMessages: 13,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

35
pb/items_db.pb.go
View File

@ -30,10 +30,11 @@ type DB_UserItemData struct {
UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id
ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量 Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量
CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量
ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间 IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
} }
func (x *DB_UserItemData) Reset() { func (x *DB_UserItemData) Reset() {
@ -96,6 +97,13 @@ func (x *DB_UserItemData) GetAmount() uint32 {
return 0 return 0
} }
func (x *DB_UserItemData) GetChange() int32 {
if x != nil {
return x.Change
}
return 0
}
func (x *DB_UserItemData) GetCTime() int64 { func (x *DB_UserItemData) GetCTime() int64 {
if x != nil { if x != nil {
return x.CTime return x.CTime
@ -128,21 +136,22 @@ var File_items_items_db_proto protoreflect.FileDescriptor
var file_items_items_db_proto_rawDesc = []byte{ var file_items_items_db_proto_rawDesc = []byte{
0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62, 0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72,
0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64,
0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d,
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05,
0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69,
0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65,
0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e,
0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

15
sys/configure/structs/Game.BattleReadyData.go
View File

@ -18,6 +18,7 @@ type GameBattleReadyData struct {
BattleScenes []string BattleScenes []string
DisableAiCamera int32 DisableAiCamera int32
DefaultHero int32 DefaultHero int32
ChoseHero []string
DisableHero []string DisableHero []string
LockSlots []int32 LockSlots []int32
AssistTeam int32 AssistTeam int32
@ -52,6 +53,20 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ChoseHero"].([]interface{}); !_ok_ { err = errors.New("ChoseHero error"); return }
_v.ChoseHero = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.ChoseHero = append(_v.ChoseHero, _list_v_)
}
}
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

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

@ -47,7 +47,7 @@ func (_v *GameRobotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["robotid"].(float64); !_ok_ { err = errors.New("robotid error"); return }; _v.Robotid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["robotid"].(float64); !_ok_ { err = errors.New("robotid error"); return }; _v.Robotid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvshow"].(float64); !_ok_ { err = errors.New("lvshow error"); return }; _v.Lvshow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvshow"].(float64); !_ok_ { err = errors.New("lvshow error"); return }; _v.Lvshow = int32(_tempNum_) }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero1"].(float64); !_ok_ { err = errors.New("hero1 error"); return }; _v.Hero1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero1"].(float64); !_ok_ { err = errors.New("hero1 error"); return }; _v.Hero1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv1"].(float64); !_ok_ { err = errors.New("lv1 error"); return }; _v.Lv1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv1"].(float64); !_ok_ { err = errors.New("lv1 error"); return }; _v.Lv1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star1"].(float64); !_ok_ { err = errors.New("star1 error"); return }; _v.Star1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star1"].(float64); !_ok_ { err = errors.New("star1 error"); return }; _v.Star1 = int32(_tempNum_) }

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

@ -114,6 +114,7 @@ type GameGlobalData struct {
ArenaTicketMax int32 ArenaTicketMax int32
ArenaTicketRecoveryTime int32 ArenaTicketRecoveryTime int32
ArenaTicketCos *Gameatn ArenaTicketCos *Gameatn
ArenaBuy []*Gameatn
VikingExpeditionRecoveryTime int32 VikingExpeditionRecoveryTime int32
CopsRecoveryTime int32 CopsRecoveryTime int32
CopsInitialNum int32 CopsInitialNum int32
@ -492,6 +493,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["Arena_buy"].([]interface{}); !_ok_ { err = errors.New("Arena_buy error"); return }
_v.ArenaBuy = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.ArenaBuy = append(_v.ArenaBuy, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_RecoveryTime"].(float64); !_ok_ { err = errors.New("cops_RecoveryTime error"); return }; _v.CopsRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_RecoveryTime"].(float64); !_ok_ { err = errors.New("cops_RecoveryTime error"); return }; _v.CopsRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_InitialNum"].(float64); !_ok_ { err = errors.New("cops_InitialNum error"); return }; _v.CopsInitialNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_InitialNum"].(float64); !_ok_ { err = errors.New("cops_InitialNum error"); return }; _v.CopsInitialNum = int32(_tempNum_) }