qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: qixin:69c44155ec0360c6a807b6ff6289d6b9fe57c050
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai
...
compare: qixin:3fa08f6640a31e3ee7b4a2024485634d5d375551
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai

5 Commits
69c44155ec ... 3fa08f6640

Author SHA1 Message Date
dy
3fa08f6640 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/json/tanxian.json
 2024-01-04 14:25:52 +08:00
dy
dabcc8baa4 Merge branch 'feature/json' into dev 
# Conflicts:
#	src/json/renown_level.json
#	src/json/tanxian.json
 2024-01-04 14:25:34 +08:00
dy
12e21ce0f1 cehua json 2024-01-04 14:25:12 +08:00
dy
0cde599ddd Merge branch 'master' into feature/json 
# Conflicts:
#	src/json/clsl_com.json5
 2024-01-04 14:24:42 +08:00
dy
ab872cf185 cehua json 2024-01-02 09:50:33 +08:00
3 changed files with 3346 additions and 3316 deletions
Show Stats Expand all files Collapse all files

30
src/json/guideConfig.json
View File

@ -1925,6 +1925,36 @@
"initiative": 1,
"location": 1
},
"186": {
"id": 186,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_mainMenu/mainMenu/btnLayout/zd",
"undefined": "点探险",
"initiative": 1,
"location": 2
},
"187": {
"id": 187,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_tanxian/tanxian/tx_map1/btn_ww",
"undefined": "点影响力按钮",
"initiative": 1,
"location": 1
},
"188": {
"id": 188,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_weiwang/weiwang/xia/shengji/btn_sj",
"undefined": "点升级按钮",
"initiative": 1,
"location": 1
},
"20001": {
"id": 20001,
"triggerType": "lose",

152
src/json/openCond.json
View File

@ -835,13 +835,13 @@
"name": "zc_btn_hs",
"undefined": "黑市",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 7
}
},
"zc_btn_jg": {
@ -887,78 +887,78 @@
"name": "shouchong",
"undefined": "首充",
"and": {
"mapId": 8
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 8
"lv": 7
}
},
"kaifukuanghuan": {
"name": "kaifukuanghuan",
"undefined": "开服狂欢",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"cz_jijin": {
"name": "cz_jijin",
"undefined": "基金入口",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin": {
"name": "jijin",
"undefined": "基金",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_gkjj": {
"name": "jijin_gkjj",
"undefined": "关卡基金",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_tbtxz": {
"name": "jijin_tbtxz",
"undefined": "特别通行证",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_tszl": {
@ -980,13 +980,13 @@
"name": "yuedujijin",
"undefined": "月度基金",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_71",
"display": {
"lv": 15
"lv": 7
}
},
"zhanling": {
@ -1006,130 +1006,130 @@
"name": "dengludali",
"undefined": "登录大礼（7日）",
"and": {
"lv": 13
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_73",
"display": {
"lv": 13
"lv": 10
}
},
"yibaichou": {
"name": "yibaichou",
"undefined": "百抽活动",
"and": {
"lv": 7
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_74",
"display": {
"lv": 7
"lv": 10
}
},
"xinfupeiyang": {
"name": "xinfupeiyang",
"undefined": "心腹培养",
"and": {
"mapId": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_75",
"display": {
"mapId": 20
"lv": 10
}
},
"huobanzhaomu": {
"name": "huobanzhaomu",
"undefined": "伙伴招募",
"and": {
"mapId": 50
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_76",
"display": {
"mapId": 50
"lv": 10
}
},
"xinshoulibao": {
"name": "xinshoulibao",
"undefined": "冲刺礼包",
"and": {
"lv": 21
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_77",
"display": {
"lv": 21
"lv": 7
}
},
"leijichongzhi": {
"name": "leijichongzhi",
"undefined": "累计充值",
"and": {
"mapId": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_78",
"tips": "openCond_tips_96",
"display": {
"mapId": 20
"lv": 10
}
},
"diaoluoduihuan": {
"name": "diaoluoduihuan",
"undefined": "掉落兑换",
"and": {
"openTime": 8
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_79",
"display": {
"openTime": 8
"lv": 10
}
},
"rencaijihua": {
"name": "rencaijihua",
"undefined": "人才计划",
"and": {
"lv": 13
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_80",
"tips": "openCond_tips_96",
"display": {
"lv": 13
"lv": 10
}
},
"zc_img6": {
"name": "zc_img6",
"undefined": "每日签到",
"and": {
"lv": 13
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_81",
"display": {
"lv": 13
"lv": 7
}
},
"dianfengrongyao": {
"name": "dianfengrongyao",
"undefined": "巅峰荣耀",
"and": {
"lv": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_82",
"display": {
"lv": 20
"lv": 10
}
},
"tuisonglibao": {
@ -1149,130 +1149,130 @@
"name": "hs_btn_tqlb",
"undefined": "特权礼包",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_84",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_ndj": {
"name": "hs_btn_ndj",
"undefined": "扭蛋机",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_85",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_yk": {
"name": "hs_btn_yk",
"undefined": "月卡",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_86",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_zsk": {
"name": "hs_btn_zsk",
"undefined": "终身卡",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_87",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_mrjx": {
"name": "hs_btn_mrjx",
"undefined": "每日精选",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_88",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_jthl": {
"name": "hs_btn_jthl",
"undefined": "积天豪礼",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_89",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_zlb": {
"name": "hs_btn_zlb",
"undefined": "周礼包",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_90",
"display": {
"lv": 15
"lv": 7
}
},
"shangcheng": {
"name": "shangcheng",
"undefined": "商城",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"fuli": {
"name": "fuli",
"undefined": "福利",
"and": {
"lv": 13
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_92",
"display": {
"lv": 13
"lv": 7
}
},
"xianshihuodong": {
"name": "xianshihuodong",
"undefined": "限时活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_93",
"display": {
"lv": 15
"lv": 10
}
},
"hb_btn_yjtz": {
@ -1285,111 +1285,111 @@
"time": 0,
"tips": "openCond_tips_94",
"display": {
"lv": 7
"lv": 30
}
},
"kaifujingsai": {
"name": "kaifujingsai",
"undefined": "开服竞赛",
"and": {
"lv": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_95",
"tips": "openCond_tips_96",
"display": {
"lv": 20
"lv": 10
}
},
"zhoumolibao": {
"name": "zhoumolibao",
"undefined": "周末礼包",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"shengdanhuodong": {
"name": "shengdanhuodong",
"undefined": "圣诞活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"yuandanhuodong": {
"name": "yuandanhuodong",
"undefined": "元旦活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"czlibao": {
"name": "czlibao",
"undefined": "超值礼包破冰",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"xiaofeijingsai": {
"name": "xiaofeijingsai",
"undefined": "钻石消费竞赛",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"leigoulibao": {
"name": "leigoulibao",
"undefined": "累购礼包",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"weiwang": {
"name": "weiwang",
"undefined": "威望",
"and": {
"lv": 15
"mapId": 15
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"mapId": 15
}
}
}

6480
src/json/tanxian.json
View File

File diff suppressed because it is too large Load Diff