jiaoyangna
|
a3f8c8aee9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 16:07:47 +08:00 |
jiaoyangna
|
6e294df15a
|
删除log
|
2021-11-11 16:07:33 +08:00 |
ZhangBiao
|
745cb6450c
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 15:09:24 +08:00 |
ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |
ZhangBiao
|
0769659e72
|
【优化】云游商人增加白金装备分解配方
|
2021-11-11 14:48:50 +08:00 |
ZhangBiao
|
d0b2bdd412
|
【灵脉秘境】提交
|
2021-11-11 14:28:02 +08:00 |
gaoxin
|
436de6bf4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 14:10:53 +08:00 |
gaoxin
|
3addb9905b
|
【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大
|
2021-11-11 14:10:48 +08:00 |
wangzhenxing
|
f71bbbdf95
|
[战斗]===========第二期神魂被动提交
|
2021-11-11 14:01:32 +08:00 |
gaoxin
|
c259e72874
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 13:49:23 +08:00 |
gaoxin
|
4ef85b5720
|
【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080
|
2021-11-11 13:49:10 +08:00 |
jiaoyangna
|
390d514bd9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 13:41:59 +08:00 |
jiaoyangna
|
4455242293
|
【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
|
2021-11-11 13:41:42 +08:00 |
gaoxin
|
ecbee47ef8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 12:00:39 +08:00 |
gaoxin
|
5d266a04d9
|
【引导】添加剧情节点
|
2021-11-11 12:00:34 +08:00 |
ZhangBiao
|
db15950d6a
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 10:56:10 +08:00 |
jiaoyangna
|
d37ed44478
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-11 10:52:15 +08:00 |
jiaoyangna
|
56ba9ccba8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 10:49:14 +08:00 |
jiaoyangna
|
d1cb61fc18
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-11 10:48:59 +08:00 |
ZhangBiao
|
3eca9bec47
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 10:11:04 +08:00 |
gaoxin
|
f4ff8d4d77
|
【登录】非sdk登录时,不重新输入账号不可以再进入游戏
|
2021-11-11 10:07:14 +08:00 |
ZhangBiao
|
c104bd65a7
|
【灵脉秘境】提交
|
2021-11-11 10:06:49 +08:00 |
jiaoyangna
|
bdb08206df
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 18:35:53 +08:00 |
jiaoyangna
|
ceb7ee3602
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-10 18:35:38 +08:00 |
gaoxin
|
f46aac739e
|
【三界降魔】修复没有坐骑时报错得问题
|
2021-11-10 17:31:38 +08:00 |
gaoxin
|
a78b4996dd
|
【抽卡】尝试修复报错黑屏
|
2021-11-10 16:57:44 +08:00 |
ZhangBiao
|
6d483802fa
|
【修行】特效穿透修改
(cherry picked from commit ee7b2b9919 )
|
2021-11-10 15:22:43 +08:00 |
ZhangBiao
|
ee7b2b9919
|
【修行】特效穿透修改
|
2021-11-10 15:20:18 +08:00 |
ZhangBiao
|
cc316086e9
|
【新·物品】界面提交
|
2021-11-10 15:03:18 +08:00 |
ZhangBiao
|
1adee43039
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 14:54:18 +08:00 |
ZhangBiao
|
f74ce2f895
|
【新·物品】界面提交
|
2021-11-10 14:53:35 +08:00 |
jiaoyangna
|
908e068f23
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 13:24:05 +08:00 |
jiaoyangna
|
1b95b2a04a
|
公会查看成员编队神将属性错误修改
|
2021-11-10 13:23:42 +08:00 |
gaoxin
|
b661b04ad1
|
【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误
|
2021-11-10 13:22:32 +08:00 |
gaoxin
|
6d377cdf69
|
【新假战斗】修改假战斗的战斗类型
|
2021-11-10 11:42:20 +08:00 |
gaoxin
|
880c77888a
|
【新假战斗】加入主角技能
|
2021-11-10 11:03:18 +08:00 |
gaoxin
|
c9e2ddcaf8
|
【新假战斗】
|
2021-11-10 09:48:42 +08:00 |
ZhangBiao
|
7efdfd5029
|
【新·装备】增加战力对比图标
|
2021-11-09 18:24:38 +08:00 |
ZhangBiao
|
c627c5cd28
|
【新·魂灵宝】增加战力对比图片
|
2021-11-09 17:35:27 +08:00 |
ZhangBiao
|
aa9cc34792
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 17:06:59 +08:00 |
ZhangBiao
|
f18880622e
|
【新·魂灵宝】提交
|
2021-11-09 17:06:47 +08:00 |
gaoxin
|
f23a455797
|
【魂印】详情界面优化
|
2021-11-09 15:48:56 +08:00 |
ZhangBiao
|
79f6f739ad
|
【天枢密卷】魂印文字过长修改
|
2021-11-09 14:44:39 +08:00 |
ZhangBiao
|
76c3c5c0bf
|
【新·魂灵宝】提交
|
2021-11-09 14:39:27 +08:00 |
ZhangBiao
|
fdffaf846e
|
【新·魂灵宝】界面提交
|
2021-11-09 11:42:19 +08:00 |
gaoxin
|
3131ffca2f
|
【资源和谐】后台控制完成
|
2021-11-09 10:49:37 +08:00 |
ZhangBiao
|
ed02f4a86f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 10:22:33 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
jiaoyangna
|
922c55e7e7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 17:23:07 +08:00 |
jiaoyangna
|
173221dd1a
|
【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
|
2021-11-08 17:22:51 +08:00 |
gaoxin
|
0595ecbb46
|
【七界试炼】添加战斗结果校验
|
2021-11-08 17:04:22 +08:00 |
jiaoyangna
|
a68330c17f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 16:31:48 +08:00 |
jiaoyangna
|
419a9cedc9
|
森罗幻境神将修改
|
2021-11-08 16:31:34 +08:00 |
ZhangBiao
|
363839c48a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 16:00:06 +08:00 |
ZhangBiao
|
76b7b5caca
|
【log】提交
|
2021-11-08 15:59:56 +08:00 |
gaoxin
|
1aa36e8ac1
|
【和谐】孟姜女加入和谐资源配置
|
2021-11-08 15:29:23 +08:00 |
wangzhenxing
|
d30fc43d9f
|
【战斗】============被动285修改
|
2021-11-08 15:28:04 +08:00 |
jiaoyangna
|
8bbdf8eed5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:18:45 +08:00 |
jiaoyangna
|
265aaca235
|
神将界面特效修改提交
|
2021-11-08 15:18:28 +08:00 |
gaoxin
|
fe99284efe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:12:59 +08:00 |
gaoxin
|
5f0dc622a5
|
【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面
|
2021-11-08 15:12:48 +08:00 |
jiaoyangna
|
dc5f09cc02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:05:27 +08:00 |
jiaoyangna
|
e457260b42
|
神将排序界面修改提交
|
2021-11-08 15:04:53 +08:00 |
gaoxin
|
fc38e204ce
|
【森罗幻境】森罗幻境神魂特效穿透
|
2021-11-08 15:04:36 +08:00 |
gaoxin
|
3dffd71924
|
【跨服战】优化打开跨服战界面,请求过多导致界面不可点击的问题
|
2021-11-08 14:49:26 +08:00 |
gaoxin
|
bbb89af48e
|
【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错
|
2021-11-08 14:10:26 +08:00 |
wangzhenxing
|
e99f8c285f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 14:02:57 +08:00 |
wangzhenxing
|
95b7fceb34
|
[神魂]======神魂升级后技能描述修改
|
2021-11-08 14:02:33 +08:00 |
gaoxin
|
67f3ca9f52
|
【适配】1080*2550,进阶白骨精法宝,文字描述遮挡
|
2021-11-08 13:39:29 +08:00 |
ZhangBiao
|
a577d80d76
|
【神魂】增加特效
|
2021-11-08 13:02:00 +08:00 |
jiaoyangna
|
c490e9c01c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 11:24:36 +08:00 |
jiaoyangna
|
1329112387
|
神魂未激活图片修改提交
|
2021-11-08 11:24:10 +08:00 |
gaoxin
|
82dd1b6512
|
【我要变强】切换页签报错
|
2021-11-08 11:20:30 +08:00 |
ZhangBiao
|
0fc2ec5b08
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 11:07:35 +08:00 |
ZhangBiao
|
2621f0f9f8
|
【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情
|
2021-11-08 11:07:11 +08:00 |
jiaoyangna
|
67c6e7d92d
|
玉虚论道编队修改
|
2021-11-08 11:06:57 +08:00 |
jiaoyangna
|
024b684999
|
排行榜神魂放大镜显示错误修改
|
2021-11-08 10:51:51 +08:00 |
jiaoyangna
|
e8433d1026
|
玉虚论道记录神魂修改提交,神将界面修改提交
|
2021-11-08 10:30:12 +08:00 |
jiaoyangna
|
cb41ba3991
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 10:20:34 +08:00 |
jiaoyangna
|
9fe5c809b8
|
灵兽界面技能描述白片修改提交
|
2021-11-08 10:20:19 +08:00 |
wangzhenxing
|
8bc936aff8
|
【神魂】=====伤害统计界面神魂显示修改
|
2021-11-05 18:24:05 +08:00 |
ZhangBiao
|
637defb9e2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 18:14:57 +08:00 |
ZhangBiao
|
a953a78018
|
【升星有礼】觉醒后没有红点修改
|
2021-11-05 18:14:44 +08:00 |
gaoxin
|
d4582cf244
|
【神魂】修复战斗中神魂特效不显示的问题
|
2021-11-05 18:13:32 +08:00 |
ZhangBiao
|
3418bac21d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 18:09:46 +08:00 |
ZhangBiao
|
104f5cbda8
|
【降妖夺宝】修改提交
|
2021-11-05 18:09:14 +08:00 |
jiaoyangna
|
5cb5137fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:38:24 +08:00 |
jiaoyangna
|
afcfc1b393
|
神魂星星修改提交
|
2021-11-05 17:38:10 +08:00 |
wangzhenxing
|
99452354bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:21:30 +08:00 |
wangzhenxing
|
a92a76e3ab
|
【神魂】=====技能描述修改
|
2021-11-05 17:21:18 +08:00 |
jiaoyangna
|
2aea503619
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:14:08 +08:00 |
jiaoyangna
|
bd8cd97bf3
|
神魂星星修改提交
|
2021-11-05 17:13:49 +08:00 |
gaoxin
|
89957b0787
|
【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次
|
2021-11-05 17:12:35 +08:00 |
gaoxin
|
0408157db2
|
【坐骑】狐狸坐骑在三界除魔榜上位置不居中
|
2021-11-05 17:00:28 +08:00 |
ZhangBiao
|
142956ca6a
|
【活动】活动修改提交
|
2021-11-05 16:43:09 +08:00 |
jiaoyangna
|
ad3b903209
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 16:20:01 +08:00 |
jiaoyangna
|
2179a76560
|
森罗幻境,公会星星修改提交
|
2021-11-05 16:19:47 +08:00 |
ZhangBiao
|
60391c16b4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 15:51:05 +08:00 |
ZhangBiao
|
ea4661b254
|
【无尽副本】修改
|
2021-11-05 15:50:49 +08:00 |
jiaoyangna
|
1c2758f26c
|
送神祠星级修改
|
2021-11-05 15:48:22 +08:00 |