Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
254dbc55fa
@ -1,67 +1,4 @@
|
||||
[
|
||||
{
|
||||
"num": 1,
|
||||
"shtime": 0,
|
||||
"smtime": 30,
|
||||
"ehtime": 0,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 2,
|
||||
"shtime": 1,
|
||||
"smtime": 30,
|
||||
"ehtime": 1,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 3,
|
||||
"shtime": 2,
|
||||
"smtime": 30,
|
||||
"ehtime": 2,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 4,
|
||||
"shtime": 3,
|
||||
"smtime": 30,
|
||||
"ehtime": 3,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 5,
|
||||
"shtime": 4,
|
||||
"smtime": 30,
|
||||
"ehtime": 4,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 6,
|
||||
"shtime": 5,
|
||||
"smtime": 30,
|
||||
"ehtime": 5,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 7,
|
||||
"shtime": 6,
|
||||
"smtime": 30,
|
||||
"ehtime": 6,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 8,
|
||||
"shtime": 7,
|
||||
"smtime": 30,
|
||||
"ehtime": 7,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 9,
|
||||
"shtime": 8,
|
||||
"smtime": 30,
|
||||
"ehtime": 8,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 10,
|
||||
"shtime": 9,
|
||||
@ -131,40 +68,5 @@
|
||||
"smtime": 30,
|
||||
"ehtime": 18,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 20,
|
||||
"shtime": 19,
|
||||
"smtime": 30,
|
||||
"ehtime": 19,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 21,
|
||||
"shtime": 20,
|
||||
"smtime": 30,
|
||||
"ehtime": 20,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 22,
|
||||
"shtime": 21,
|
||||
"smtime": 30,
|
||||
"ehtime": 21,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 23,
|
||||
"shtime": 22,
|
||||
"smtime": 30,
|
||||
"ehtime": 22,
|
||||
"emtime": 50
|
||||
},
|
||||
{
|
||||
"num": 24,
|
||||
"shtime": 23,
|
||||
"smtime": 30,
|
||||
"ehtime": 23,
|
||||
"emtime": 50
|
||||
}
|
||||
]
|
||||
@ -736,7 +736,6 @@
|
||||
"n": 200
|
||||
},
|
||||
"dragon_interaction": 15,
|
||||
"dialogueclickcd": 0.4,
|
||||
"doragon_item": "24012003",
|
||||
"sign_account": 28,
|
||||
"dragon_funtime": 700,
|
||||
@ -773,7 +772,9 @@
|
||||
"catchbugturn": 6,
|
||||
"NewDrawcardAttempts_Nums": 30,
|
||||
"stonehenge_guideStage": 88,
|
||||
"story_waittime": 0.8,
|
||||
"dialogueclickcd": 0.5,
|
||||
"story_waittime": 0.1,
|
||||
"story_waittime_gaptime": 1,
|
||||
"sx_ranknum": 200,
|
||||
"IntegralBoss_challenge_num": 9999,
|
||||
"friend_help_hero_refresh_num": 5,
|
||||
|
||||
@ -1,34 +1,4 @@
|
||||
[
|
||||
{
|
||||
"index": "353",
|
||||
"var": [
|
||||
{
|
||||
"a": "per",
|
||||
"t": "16010101",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "354",
|
||||
"var": [
|
||||
{
|
||||
"a": "per",
|
||||
"t": "16010102",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "355",
|
||||
"var": [
|
||||
{
|
||||
"a": "per",
|
||||
"t": "16010103",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "356",
|
||||
"var": [
|
||||
@ -88,15 +58,5 @@
|
||||
"n": 60
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "362",
|
||||
"var": [
|
||||
{
|
||||
"a": "per",
|
||||
"t": "16010104",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -43945,7 +43945,7 @@
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": false,
|
||||
"battle_fail": false,
|
||||
"battle_fail": true,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
@ -44912,7 +44912,7 @@
|
||||
"chapterid": 12002,
|
||||
"group_id": 200211,
|
||||
"previous_group_id": [
|
||||
200211
|
||||
200210
|
||||
],
|
||||
"previoustage": 1202011,
|
||||
"buried_type": 0,
|
||||
|
||||
@ -3,18 +3,18 @@
|
||||
"node_id": 1,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_1",
|
||||
"text": "伯克岛"
|
||||
"text": "蜜月酒店"
|
||||
},
|
||||
"time": [
|
||||
0
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_1",
|
||||
"text": "{0}后可航行至伯克岛"
|
||||
"text": "{0}后可航行至蜜月酒店"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_1",
|
||||
"text": "航行抵达伯克岛"
|
||||
"text": "航行抵达蜜月酒店"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
@ -27,18 +27,18 @@
|
||||
"node_id": 2,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_2",
|
||||
"text": "战栗海岸"
|
||||
"text": "杜洛克"
|
||||
},
|
||||
"time": [
|
||||
2
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_2",
|
||||
"text": "{0}后可航行至战栗海岸"
|
||||
"text": "{0}后可航行至杜洛克"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_2",
|
||||
"text": "航行抵达战栗海岸"
|
||||
"text": "航行抵达杜洛克"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
@ -51,18 +51,18 @@
|
||||
"node_id": 3,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_3",
|
||||
"text": "西西伯利亚"
|
||||
"text": "远得要命王国"
|
||||
},
|
||||
"time": [
|
||||
4
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_3",
|
||||
"text": "{0}后可航行至西西伯利亚"
|
||||
"text": "{0}后可航行至远得要命王国"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_3",
|
||||
"text": "航行抵达西西伯利亚"
|
||||
"text": "航行抵达远得要命王国"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
@ -75,18 +75,18 @@
|
||||
"node_id": 4,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_4",
|
||||
"text": "巴尔干半岛"
|
||||
"text": "肥仔快餐"
|
||||
},
|
||||
"time": [
|
||||
6
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_4",
|
||||
"text": "{0}后可航行至巴尔干半岛"
|
||||
"text": "{0}后可航行至肥仔快餐"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_4",
|
||||
"text": "航行抵达巴尔干半岛"
|
||||
"text": "航行抵达肥仔快餐"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
@ -99,18 +99,18 @@
|
||||
"node_id": 5,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_5",
|
||||
"text": "新加坡海峡"
|
||||
"text": "毒苹果酒吧"
|
||||
},
|
||||
"time": [
|
||||
8
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_5",
|
||||
"text": "{0}后可航行至新加坡海峡"
|
||||
"text": "{0}后可航行至毒苹果酒吧"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_5",
|
||||
"text": "航行抵达新加坡海峡"
|
||||
"text": "航行抵达毒苹果酒吧"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
@ -123,18 +123,18 @@
|
||||
"node_id": 6,
|
||||
"puggsy_name": {
|
||||
"key": "puggsy_puggsy_puggsy_name_6",
|
||||
"text": "马奇洛"
|
||||
"text": "乌斯特郡"
|
||||
},
|
||||
"time": [
|
||||
10
|
||||
],
|
||||
"unlock": {
|
||||
"key": "puggsy_puggsy_unlock_6",
|
||||
"text": "{0}后可航行至马奇洛"
|
||||
"text": "{0}后可航行至乌斯特郡"
|
||||
},
|
||||
"introduce": {
|
||||
"key": "puggsy_puggsy_introduce_6",
|
||||
"text": "航行抵达马奇洛"
|
||||
"text": "航行抵达乌斯特郡"
|
||||
},
|
||||
"scene": 10011,
|
||||
"png": [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_1",
|
||||
"icon": "cookieite_1_1",
|
||||
"icon": "cookieitem_1_1",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -18,11 +18,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_1",
|
||||
"icon": "cookieite_2_1",
|
||||
"icon": "cookieitem_2_1",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -31,11 +31,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_1",
|
||||
"icon": "cookieite_3_1",
|
||||
"icon": "cookieitem_3_1",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -44,11 +44,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_1",
|
||||
"icon": "cookieite_4_1",
|
||||
"icon": "cookieitem_4_1",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -57,11 +57,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_1",
|
||||
"icon": "cookieite_5_1",
|
||||
"icon": "cookieitem_5_1",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -70,11 +70,11 @@
|
||||
"position": 1,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_1",
|
||||
"text": "拉胚"
|
||||
"text": "身体"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_1",
|
||||
"icon": "cookieite_6_1",
|
||||
"icon": "cookieitem_6_1",
|
||||
"value": 1000
|
||||
},
|
||||
{
|
||||
@ -83,11 +83,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_2",
|
||||
"icon": "cookieite_1_2",
|
||||
"icon": "cookieitem_1_2",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -96,11 +96,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_2",
|
||||
"icon": "cookieite_2_2",
|
||||
"icon": "cookieitem_2_2",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -109,11 +109,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_2",
|
||||
"icon": "cookieite_3_2",
|
||||
"icon": "cookieitem_3_2",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -122,11 +122,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_2",
|
||||
"icon": "cookieite_4_2",
|
||||
"icon": "cookieitem_4_2",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -135,11 +135,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_2",
|
||||
"icon": "cookieite_5_2",
|
||||
"icon": "cookieitem_5_2",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -148,11 +148,11 @@
|
||||
"position": 2,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_2",
|
||||
"text": "器刃"
|
||||
"text": "面容"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_2",
|
||||
"icon": "cookieite_6_2",
|
||||
"icon": "cookieitem_6_2",
|
||||
"value": 1000
|
||||
},
|
||||
{
|
||||
@ -161,11 +161,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_3",
|
||||
"icon": "cookieite_1_3",
|
||||
"icon": "cookieitem_1_3",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -174,11 +174,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_3",
|
||||
"icon": "cookieite_2_3",
|
||||
"icon": "cookieitem_2_3",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -187,11 +187,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_3",
|
||||
"icon": "cookieite_3_3",
|
||||
"icon": "cookieitem_3_3",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -200,11 +200,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_3",
|
||||
"icon": "cookieite_4_3",
|
||||
"icon": "cookieitem_4_3",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -213,11 +213,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_3",
|
||||
"icon": "cookieite_5_3",
|
||||
"icon": "cookieitem_5_3",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -226,11 +226,11 @@
|
||||
"position": 3,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_3",
|
||||
"text": "傍身"
|
||||
"text": "饰品"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_3",
|
||||
"icon": "cookieite_6_3",
|
||||
"icon": "cookieitem_6_3",
|
||||
"value": 1000
|
||||
},
|
||||
{
|
||||
@ -239,11 +239,11 @@
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
"text": "头饰"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_4",
|
||||
"icon": "cookieite_1_4",
|
||||
"png": "cookie_3_4",
|
||||
"icon": "cookieitem_3_4",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -252,11 +252,11 @@
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
"text": "头饰"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_4",
|
||||
"icon": "cookieite_2_4",
|
||||
"png": "cookie_4_4",
|
||||
"icon": "cookieitem_4_4",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -265,11 +265,11 @@
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
"text": "头饰"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_4",
|
||||
"icon": "cookieite_3_4",
|
||||
"png": "cookie_5_4",
|
||||
"icon": "cookieitem_5_4",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -278,38 +278,12 @@
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
"text": "头饰"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_4",
|
||||
"icon": "cookieite_4_4",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 23,
|
||||
"make_id": 1,
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_4",
|
||||
"icon": "cookieite_5_4",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 24,
|
||||
"make_id": 1,
|
||||
"position": 4,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_4",
|
||||
"text": "器身"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_4",
|
||||
"icon": "cookieite_6_4",
|
||||
"value": 1000
|
||||
"icon": "cookieitem_6_4",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 25,
|
||||
@ -317,11 +291,11 @@
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
"text": "腰饰"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_5",
|
||||
"icon": "cookieite_1_5",
|
||||
"png": "cookie_2_5",
|
||||
"icon": "cookieitem_2_5",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -330,11 +304,11 @@
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
"text": "腰饰"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_5",
|
||||
"icon": "cookieite_2_5",
|
||||
"png": "cookie_3_5",
|
||||
"icon": "cookieitem_3_5",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -343,11 +317,11 @@
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
"text": "腰饰"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_5",
|
||||
"icon": "cookieite_3_5",
|
||||
"png": "cookie_4_5",
|
||||
"icon": "cookieitem_4_5",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
@ -356,11 +330,11 @@
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
"text": "腰饰"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_5",
|
||||
"icon": "cookieite_4_5",
|
||||
"png": "cookie_5_5",
|
||||
"icon": "cookieitem_5_5",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
@ -369,102 +343,11 @@
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
"text": "腰饰"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_5",
|
||||
"icon": "cookieite_5_5",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 30,
|
||||
"make_id": 1,
|
||||
"position": 5,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_5",
|
||||
"text": "涂装"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_5",
|
||||
"icon": "cookieite_6_5",
|
||||
"value": 1000
|
||||
},
|
||||
{
|
||||
"id": 31,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 1,
|
||||
"png": "cookie_1_6",
|
||||
"icon": "cookieite_1_6",
|
||||
"icon": "cookieitem_6_5",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
"id": 32,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 2,
|
||||
"png": "cookie_2_6",
|
||||
"icon": "cookieite_2_6",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
"id": 33,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 3,
|
||||
"png": "cookie_3_6",
|
||||
"icon": "cookieite_3_6",
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
"id": 34,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 4,
|
||||
"png": "cookie_4_6",
|
||||
"icon": "cookieite_4_6",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 35,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 5,
|
||||
"png": "cookie_5_6",
|
||||
"icon": "cookieite_5_6",
|
||||
"value": 500
|
||||
},
|
||||
{
|
||||
"id": 36,
|
||||
"make_id": 1,
|
||||
"position": 6,
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_make_make_text_6",
|
||||
"text": "刻纹"
|
||||
},
|
||||
"subitem": 6,
|
||||
"png": "cookie_6_6",
|
||||
"icon": "cookieite_6_6",
|
||||
"value": 1000
|
||||
}
|
||||
]
|
||||
@ -3,19 +3,19 @@
|
||||
"make_id": 1,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_1",
|
||||
"text": "蛋糕工坊"
|
||||
"text": "酒店甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_1",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_1",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_1",
|
||||
"star": 4,
|
||||
"score": 4000,
|
||||
"score": 1000,
|
||||
"fire": 1,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
@ -30,19 +30,19 @@
|
||||
"make_id": 2,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_2",
|
||||
"text": "玉米工坊"
|
||||
"text": "杜洛克甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_2",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_2",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_2",
|
||||
"star": 4,
|
||||
"score": 4000,
|
||||
"score": 1000,
|
||||
"fire": 2,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
@ -57,19 +57,19 @@
|
||||
"make_id": 3,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_3",
|
||||
"text": "香蕉工坊"
|
||||
"text": "王国甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_3",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_3",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_3",
|
||||
"star": 4,
|
||||
"score": 4000,
|
||||
"score": 1000,
|
||||
"fire": 3,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
@ -84,19 +84,19 @@
|
||||
"make_id": 4,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_4",
|
||||
"text": "西瓜工坊"
|
||||
"text": "肥宅甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_4",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_4",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_4",
|
||||
"star": 4,
|
||||
"score": 4000,
|
||||
"score": 1000,
|
||||
"fire": 1,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
@ -111,19 +111,19 @@
|
||||
"make_id": 5,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_5",
|
||||
"text": "冰淇淋工坊"
|
||||
"text": "酒吧甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_5",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_5",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_5",
|
||||
"star": 5,
|
||||
"score": 5000,
|
||||
"score": 1000,
|
||||
"fire": 2,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
@ -138,19 +138,19 @@
|
||||
"make_id": 6,
|
||||
"make_title": {
|
||||
"key": "puggsy_puggsy_star_make_title_6",
|
||||
"text": "番茄工坊"
|
||||
"text": "乌斯特甜品屋"
|
||||
},
|
||||
"make_text": {
|
||||
"key": "puggsy_puggsy_star_make_text_6",
|
||||
"text": "走过路过不要错过，买不了吃亏买不了上当"
|
||||
"text": "不光外表可爱，姜饼的口感也很不错，把姜加入到饼干中，吃起来又甜又辣"
|
||||
},
|
||||
"condition_text": {
|
||||
"key": "puggsy_puggsy_star_condition_text_6",
|
||||
"text": "奖励条件：制作出{0}星以上的遗器"
|
||||
"text": "奖励条件：制作出{0}星以上的姜饼"
|
||||
},
|
||||
"png": "cookie_6",
|
||||
"star": 5,
|
||||
"score": 5000,
|
||||
"score": 1000,
|
||||
"fire": 3,
|
||||
"value": 1000,
|
||||
"drop": [
|
||||
|
||||
@ -93,6 +93,11 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
|
||||
)
|
||||
return
|
||||
}
|
||||
res = append(res, &cfg.Gameatn{
|
||||
A: comm.PerType,
|
||||
T: req.Skin,
|
||||
N: 1,
|
||||
})
|
||||
//初始化创角资源
|
||||
if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
|
||||
for _, v := range val.GetDataList() {
|
||||
|
||||
@ -312,7 +312,6 @@ type Tables struct {
|
||||
PuggsyEvent *GamePuggsyEvent
|
||||
PuggsyFight *GamePuggsyFight
|
||||
PuggsyScore *GamePuggsyScore
|
||||
PuggsySkill *GamePuggsySkill
|
||||
Catchrabbit *GameCatchrabbit
|
||||
Unblanking *GameUnblanking
|
||||
CatchbugSset *GameCatchbugSset
|
||||
@ -2172,12 +2171,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.PuggsyScore, err = NewGamePuggsyScore(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_puggsyskill") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.PuggsySkill, err = NewGamePuggsySkill(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_catchrabbit") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -250,7 +250,6 @@ type GameGlobalData struct {
|
||||
PsBuyGroup int32
|
||||
ChangeName *Gameatn
|
||||
DragonInteraction int32
|
||||
Dialogueclickcd float32
|
||||
DoragonItem string
|
||||
SignAccount int32
|
||||
DragonFuntime int32
|
||||
@ -270,7 +269,9 @@ type GameGlobalData struct {
|
||||
Catchbugturn int32
|
||||
NewDrawcardAttemptsNums int32
|
||||
StonehengeGuideStage int32
|
||||
Dialogueclickcd float32
|
||||
StoryWaittime float32
|
||||
StoryWaittimeGaptime float32
|
||||
SxRanknum int32
|
||||
IntegralBossChallengeNum int32
|
||||
FriendHelpHeroRefreshNum int32
|
||||
@ -1050,7 +1051,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_buyGroup"].(float64); !_ok_ { err = errors.New("ps_buyGroup error"); return }; _v.PsBuyGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["change_name"].(map[string]interface{}); !_ok_ { err = errors.New("change_name error"); return }; if _v.ChangeName, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dragon_interaction"].(float64); !_ok_ { err = errors.New("dragon_interaction error"); return }; _v.DragonInteraction = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dialogueclickcd"].(float64); !_ok_ { err = errors.New("dialogueclickcd error"); return }; _v.Dialogueclickcd = float32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.DoragonItem, _ok_ = _buf["doragon_item"].(string); !_ok_ { err = errors.New("doragon_item error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sign_account"].(float64); !_ok_ { err = errors.New("sign_account error"); return }; _v.SignAccount = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dragon_funtime"].(float64); !_ok_ { err = errors.New("dragon_funtime error"); return }; _v.DragonFuntime = int32(_tempNum_) }
|
||||
@ -1096,7 +1096,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["catchbugturn"].(float64); !_ok_ { err = errors.New("catchbugturn error"); return }; _v.Catchbugturn = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NewDrawcardAttempts_Nums"].(float64); !_ok_ { err = errors.New("NewDrawcardAttempts_Nums error"); return }; _v.NewDrawcardAttemptsNums = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stonehenge_guideStage"].(float64); !_ok_ { err = errors.New("stonehenge_guideStage error"); return }; _v.StonehengeGuideStage = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dialogueclickcd"].(float64); !_ok_ { err = errors.New("dialogueclickcd error"); return }; _v.Dialogueclickcd = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story_waittime"].(float64); !_ok_ { err = errors.New("story_waittime error"); return }; _v.StoryWaittime = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story_waittime_gaptime"].(float64); !_ok_ { err = errors.New("story_waittime_gaptime error"); return }; _v.StoryWaittimeGaptime = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sx_ranknum"].(float64); !_ok_ { err = errors.New("sx_ranknum error"); return }; _v.SxRanknum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["IntegralBoss_challenge_num"].(float64); !_ok_ { err = errors.New("IntegralBoss_challenge_num error"); return }; _v.IntegralBossChallengeNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_help_hero_refresh_num"].(float64); !_ok_ { err = errors.New("friend_help_hero_refresh_num error"); return }; _v.FriendHelpHeroRefreshNum = int32(_tempNum_) }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user