jiaoyangna
|
5bd09017e0
|
掩藏神魂
|
2022-01-17 13:23:19 +08:00 |
ZhangBiao
|
e3196e3ca2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:16:30 +08:00 |
ZhangBiao
|
409836ffb5
|
【名望礼包】提交
|
2022-01-17 13:16:18 +08:00 |
jiaoyangna
|
a4cbd77a99
|
许愿神将修改提交
|
2022-01-17 11:23:22 +08:00 |
jiaoyangna
|
4c1b1dbc30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:19:23 +08:00 |
jiaoyangna
|
4abe2d4203
|
Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43 .
|
2022-01-17 11:18:55 +08:00 |
gaoxin
|
58b5702a30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:06:41 +08:00 |
gaoxin
|
e99f1a2ca7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:02:48 +08:00 |
gaoxin
|
69e30f8fd0
|
【关卡】功能引导时关闭小手显示
|
2022-01-17 11:02:33 +08:00 |
wangzhenxing
|
6be87dec74
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 11:00:42 +08:00 |
jiaoyangna
|
501d3758fd
|
升级显示消耗
|
2022-01-17 10:59:48 +08:00 |
jiaoyangna
|
6d3d7f5e4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 10:59:08 +08:00 |
wangzhenxing
|
51d1f9e5a7
|
【图鉴】======图鉴列表界面预设修改
|
2022-01-17 10:58:36 +08:00 |
jiaoyangna
|
28b3fb33f3
|
技能报错修改提交
|
2022-01-17 10:56:38 +08:00 |
ZhangBiao
|
34edc4332e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 10:53:19 +08:00 |
ZhangBiao
|
ffbdafd13e
|
【修行】红点检测
|
2022-01-17 10:53:06 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
wangzhenxing
|
082afa8466
|
【飞升】=====角色主界面修改
|
2022-01-17 10:47:15 +08:00 |
wangzhenxing
|
eb6a0c5dde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 10:46:12 +08:00 |
wangzhenxing
|
21e77fe60b
|
[图鉴]=======图鉴详情预设修改
|
2022-01-17 10:45:42 +08:00 |
ZhangBiao
|
98f89d8a9b
|
【摘星阁+修为】装备属性展示+修为红点检测
|
2022-01-17 10:44:43 +08:00 |
ZhangBiao
|
91f9589043
|
【摘星阁】装备属性
|
2022-01-17 10:33:42 +08:00 |
ZhangBiao
|
e93b2816b4
|
【摘星阁】装备摘星阁属性拆分
|
2022-01-17 10:24:27 +08:00 |
jiaoyangna
|
fbd1c9aa43
|
许愿神将修改提交
|
2022-01-17 09:41:00 +08:00 |
wangzhenxing
|
9357e70d42
|
[角色信息]======名字位置修改
|
2022-01-15 18:44:08 +08:00 |
ZhangBiao
|
10070d14ca
|
【跳转】提交
|
2022-01-15 18:29:18 +08:00 |
ZhangBiao
|
a556bf7761
|
【玩家信息】提交
|
2022-01-15 18:17:46 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
aa90cae885
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 18:07:57 +08:00 |
ZhangBiao
|
2b8cb81ff3
|
【充值】跳转修改
|
2022-01-15 18:07:43 +08:00 |
wangzhenxing
|
692c333b34
|
[战斗]========被动421修改提交
|
2022-01-15 17:44:32 +08:00 |
ZhangBiao
|
e67ea3ae70
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 17:34:26 +08:00 |
ZhangBiao
|
b96aa3851c
|
【好感度】提交
|
2022-01-15 17:34:18 +08:00 |
wangzhenxing
|
1d170dfd2d
|
[图鉴]==========图鉴详情修改提交
|
2022-01-15 17:12:40 +08:00 |
wangzhenxing
|
2df3e777db
|
[图片]====记录按钮资源修改
|
2022-01-15 16:38:45 +08:00 |
wangzhenxing
|
1ef962d688
|
【图鉴】====飞升通用图标资源修改
|
2022-01-15 16:05:54 +08:00 |
ZhangBiao
|
fa7123e998
|
【主题活动】0120-0202寻宝迷踪珍奇宝阁报错
|
2022-01-15 15:53:28 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
1f9275e9d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 15:05:35 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
wangzhenxing
|
6f56edbdf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:46:55 +08:00 |
ZhangBiao
|
38fb5a9ada
|
【每日特惠】每日特惠中免费和7天的按钮消失了
|
2022-01-15 14:40:06 +08:00 |
wangzhenxing
|
c083c2c903
|
【战斗】====被动419修改
|
2022-01-15 14:38:56 +08:00 |
ZhangBiao
|
756dc54595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:35:21 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
wangzhenxing
|
e8f8f5ca59
|
[图鉴]=====图鉴详情修改提交
|
2022-01-15 14:32:55 +08:00 |
ZhangBiao
|
bca67f4fd6
|
【玩家信息】报错修改
|
2022-01-15 13:26:22 +08:00 |
wangzhenxing
|
3311a00b91
|
【飞升】=======globadefine修改
|
2022-01-15 13:25:48 +08:00 |
ZhangBiao
|
28d4b2a8be
|
【玩家信息】提交
|
2022-01-15 13:07:28 +08:00 |
ZhangBiao
|
7feefd2078
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 13:01:44 +08:00 |