ZhangBiao
|
ed48c7ce00
|
【寻仙招募】修改,提交
|
2022-01-15 10:27:48 +08:00 |
ZhangBiao
|
232491eb95
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 09:14:10 +08:00 |
jiaoyangna
|
9f5addf443
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 19:14:04 +08:00 |
jiaoyangna
|
98f23e56ea
|
神将修改提交
|
2022-01-14 19:13:46 +08:00 |
wangzhenxing
|
c2c9eda981
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:50:17 +08:00 |
wangzhenxing
|
05377b9595
|
[图鉴]==== 图鉴 图鉴详情界面修改
|
2022-01-14 18:49:49 +08:00 |
jiaoyangna
|
75be0809dd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:49:21 +08:00 |
jiaoyangna
|
b0611db595
|
神将技能修改提交
|
2022-01-14 18:48:23 +08:00 |
ZhangBiao
|
e1a52271be
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:47:55 +08:00 |
ZhangBiao
|
5d2fdc5773
|
【仙缘汇聚箱】报错修改
|
2022-01-14 18:47:41 +08:00 |
jiaoyangna
|
2df72a0edd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:40:17 +08:00 |
jiaoyangna
|
3369bcc73c
|
心愿修改提交
|
2022-01-14 18:40:00 +08:00 |
ZhangBiao
|
3e47cae110
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:28:47 +08:00 |
ZhangBiao
|
d7bd3a07d8
|
【心愿抽奖】报错修改
|
2022-01-14 18:28:36 +08:00 |
jiaoyangna
|
ea69ec6643
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:59:05 +08:00 |
jiaoyangna
|
81ce84e7be
|
升级修改提交
|
2022-01-14 17:57:12 +08:00 |
ZhangBiao
|
9d8586008d
|
【家园】资源替换
|
2022-01-14 17:51:56 +08:00 |
ZhangBiao
|
0b7943c391
|
【家园】特权按钮修改
|
2022-01-14 17:44:54 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
ZhangBiao
|
dddbe9f223
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:20:18 +08:00 |
ZhangBiao
|
9ec22eee1f
|
【好感度】引导
|
2022-01-14 17:20:06 +08:00 |
jiaoyangna
|
b249db487a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:14:11 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
gaoxin
|
7c5284b1e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 17:11:08 +08:00 |
gaoxin
|
df2e07b0e3
|
【心魔编队】保存后自动关闭界面
|
2022-01-14 17:11:02 +08:00 |
jiaoyangna
|
e6791caf3f
|
图片修改提交
|
2022-01-14 17:08:41 +08:00 |
jiaoyangna
|
0189f5c742
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 16:15:17 +08:00 |
jiaoyangna
|
3f267894a8
|
神将修改提交
|
2022-01-14 16:14:52 +08:00 |
ZhangBiao
|
8f554eca59
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 16:02:59 +08:00 |
gaoxin
|
1c827a3a23
|
【关卡】有可挑战关卡时添加小手显示
|
2022-01-14 16:02:10 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
jiaoyangna
|
2142bc452b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:53:14 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
ZhangBiao
|
771c445488
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 14:16:47 +08:00 |
ZhangBiao
|
f9990072d5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:15:16 +08:00 |
ZhangBiao
|
930b93286d
|
【家园】数据不更新修改
|
2022-01-14 14:14:48 +08:00 |
gaoxin
|
69e6011950
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 13:52:55 +08:00 |
gaoxin
|
09f65e9f38
|
【修行】优化修行突破后显示
|
2022-01-14 13:51:13 +08:00 |
wangzhenxing
|
a92dfdf671
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 13:50:19 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
jiaoyangna
|
7556405e8b
|
切图修改
|
2022-01-14 13:45:12 +08:00 |
jiaoyangna
|
5252dbe400
|
技能添加底图
|
2022-01-14 13:20:32 +08:00 |
jiaoyangna
|
0323c50be5
|
法宝角标修改
|
2022-01-14 11:31:33 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
jiaoyangna
|
8377e33b31
|
神将情报修改提交
|
2022-01-14 10:50:51 +08:00 |
jiaoyangna
|
17db5f29c4
|
框修改提交
|
2022-01-14 10:25:27 +08:00 |
jiaoyangna
|
ed63358ab6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
# Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
|
2022-01-14 10:19:54 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |
ZhangBiao
|
8af671a6f8
|
【装备加持】排行榜查看玩家时装备加持不显示突破数值和突破属性
|
2022-01-14 10:14:29 +08:00 |
ZhangBiao
|
5b36346da3
|
【玩家信息】提交
|
2022-01-13 18:29:12 +08:00 |
ZhangBiao
|
27cb303fc3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 18:27:01 +08:00 |
ZhangBiao
|
1e234c6aa8
|
【家园】材料不足突破红点修复
|
2022-01-13 18:26:39 +08:00 |
gaoxin
|
a119734ba8
|
[meta]
|
2022-01-13 17:55:12 +08:00 |
wangzhenxing
|
931e2e304d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 17:45:54 +08:00 |
wangzhenxing
|
69d1a45883
|
【战斗】=====反伤盾图片提交
|
2022-01-13 17:45:31 +08:00 |
jiaoyangna
|
fe4c807633
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 16:41:45 +08:00 |
jiaoyangna
|
1515c59bac
|
法宝聚灵添加白金
|
2022-01-13 16:41:23 +08:00 |
gaoxin
|
70d753cce5
|
极速探索按钮颜色调整
|
2022-01-13 16:41:12 +08:00 |
ZhangBiao
|
f043b3e62f
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-13 16:04:36 +08:00 |
ZhangBiao
|
898f88a0b9
|
【寻仙招募】修改奖励显示内容
|
2022-01-13 16:03:20 +08:00 |
ZhangBiao
|
2599afd6de
|
【寻仙招募】心愿选飞升石,查看奖励报错
|
2022-01-13 15:28:09 +08:00 |
ZhangBiao
|
36b475ee15
|
【玩家信息】增加额外属性
|
2022-01-13 15:23:59 +08:00 |
lihaiyang
|
228efd4109
|
4个法宝图标
|
2022-01-13 15:17:17 +08:00 |
jiaoyangna
|
a4848406b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 14:00:28 +08:00 |
jiaoyangna
|
0e8e6e1874
|
探索修改提交
|
2022-01-13 13:59:15 +08:00 |
gaoxin
|
8351aba49c
|
【战斗】我方buff显示位置修改
|
2022-01-13 13:56:08 +08:00 |
lihaiyang
|
be545631ad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 13:36:50 +08:00 |
lihaiyang
|
8aef1e33ed
|
被动图标
|
2022-01-13 13:27:30 +08:00 |
gaoxin
|
455cdcd19c
|
【日常副本】列表动画添加
|
2022-01-13 12:04:22 +08:00 |
gaoxin
|
4ffae70799
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 11:39:15 +08:00 |
gaoxin
|
1c5736bbad
|
【动画】部分界面动画优化
|
2022-01-13 11:39:02 +08:00 |
gaoxin
|
db279baaf7
|
【跨服战】尝试修复打开跨服战报错
|
2022-01-15 07:36:48 +08:00 |
gaoxin
|
a30aa0df10
|
【家园】修复等级为0时查看神将信息报错
|
2022-01-15 07:22:52 +08:00 |
jiaoyangna
|
07534deff9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-13 11:18:28 +08:00 |
jiaoyangna
|
8b4533aac9
|
一键探索调整编队后探索地图修改提交
|
2022-01-13 11:17:18 +08:00 |
wangzhenxing
|
a16b592892
|
[飞升]=========飞升优化修改
|
2022-01-13 10:01:22 +08:00 |
ZhangBiao
|
48901f3817
|
【寻仙招募】心愿单中添加飞升石道具
|
2022-01-12 18:27:16 +08:00 |
wangzhenxing
|
cd1b81c03e
|
[飞升]======飞升修改提交
|
2022-01-12 17:29:52 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
ZhangBiao
|
1e8cceea57
|
【家园】特效层级修改
|
2022-01-12 15:55:24 +08:00 |
ZhangBiao
|
a74799caea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 15:38:45 +08:00 |
ZhangBiao
|
f131da8558
|
【方寸寻宝】点击自选箱显示详细信息
|
2022-01-12 15:38:31 +08:00 |
jiaoyangna
|
05e078dadc
|
探索引导修改提交
|
2022-01-12 15:27:35 +08:00 |
jiaoyangna
|
1e1e697ba4
|
预设漏提
|
2022-01-12 14:40:28 +08:00 |
jiaoyangna
|
6cc1b55503
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 14:36:43 +08:00 |
jiaoyangna
|
0b4cfe3a74
|
点击技能切换修改
|
2022-01-12 14:35:27 +08:00 |
ZhangBiao
|
6d29d5dce2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 14:28:26 +08:00 |
ZhangBiao
|
373ae35652
|
【家园】详情位置修改
|
2022-01-12 14:28:14 +08:00 |
jiaoyangna
|
bde65d0ecf
|
森罗幻境累计奖励修改提交
|
2022-01-12 13:49:16 +08:00 |
jiaoyangna
|
82421e45bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-12 13:38:59 +08:00 |
jiaoyangna
|
93fda69ff5
|
升级突破状态显示错误修改
|
2022-01-12 13:37:39 +08:00 |
ZhangBiao
|
d0fb035a19
|
【家园】提交弹框背景
|
2022-01-11 18:23:08 +08:00 |
ZhangBiao
|
60c31c1d5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:20:19 +08:00 |
ZhangBiao
|
617a557071
|
【家园】修改按钮
|
2022-01-11 18:20:12 +08:00 |
ZhangBiao
|
9826244e7e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:19:02 +08:00 |
ZhangBiao
|
8d82a962a6
|
【家园】特效提交
|
2022-01-11 18:18:41 +08:00 |
wangzhenxing
|
039f9a3deb
|
[图鉴]======图鉴修改提交
|
2022-01-11 18:11:13 +08:00 |
ZhangBiao
|
9f8ee231ac
|
【装备界面】排行榜数据错误修改
|
2022-01-11 17:51:56 +08:00 |
zhangshanxue
|
18c1ef2de1
|
【物品】浮生门物品资源路径需修改
|
2022-01-14 17:23:40 +08:00 |
ZhangBiao
|
41dc638b32
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 16:44:52 +08:00 |
ZhangBiao
|
e9d69353e0
|
【家园】建筑点击无效修改
|
2022-01-11 16:44:37 +08:00 |
lihaiyang
|
066d55fcc1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 16:38:11 +08:00 |
lihaiyang
|
2a47ffda3f
|
替换两个图标
|
2022-01-11 16:33:50 +08:00 |
jiaoyangna
|
f943824ae9
|
共鸣中修改提交
|
2022-01-11 15:40:22 +08:00 |
jiaoyangna
|
a01485ebab
|
资源提交
|
2022-01-11 15:36:17 +08:00 |
jiaoyangna
|
73f2fd21ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 15:31:48 +08:00 |
jiaoyangna
|
e12e783590
|
共鸣中修改提交
|
2022-01-11 15:31:19 +08:00 |
lihaiyang
|
875da0fe84
|
被动技能临时图标
|
2022-01-11 15:05:13 +08:00 |
jiaoyangna
|
36c6228096
|
图片修改提交
|
2022-01-11 14:56:37 +08:00 |
jiaoyangna
|
4d58e36be4
|
神将界面技能报错修改
|
2022-01-11 14:44:16 +08:00 |
jiaoyangna
|
e74d94e59e
|
神将情报界面修改提交
|
2022-01-11 14:40:18 +08:00 |
jiaoyangna
|
3cc4a7e6a3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 14:25:37 +08:00 |
gaoxin
|
0ee930c550
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:01:01 +08:00 |
gaoxin
|
5d2838554d
|
Merge branch '0活动/新大圣升星' into china/dev
|
2022-01-14 14:00:20 +08:00 |
gaoxin
|
e7a17fcd9e
|
【云梦豪礼】每日添加红点提示
|
2022-01-14 14:00:13 +08:00 |
gaoxin
|
2561da2203
|
【限时升星】选择舞小
|
2022-01-14 13:37:43 +08:00 |
gaoxin
|
81b3d254f4
|
【限时升星】锁定提示文字修改,选择神将保存到本地
|
2022-01-14 13:33:42 +08:00 |
gaoxin
|
9fbc2df41f
|
【限时升星】界面显示优化
|
2022-01-14 12:03:28 +08:00 |
gaoxin
|
dbbfc9dfe3
|
【限时升星】选择神将界面标题错误
|
2022-01-14 11:50:16 +08:00 |
gaoxin
|
978d4acb4e
|
【限时升星】资源上传
|
2022-01-14 10:48:24 +08:00 |
jiaoyangna
|
af9306d8cf
|
未解锁添加未解锁提示
|
2022-01-11 14:23:24 +08:00 |
wangzhenxing
|
c219f28f6a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 13:57:09 +08:00 |
wangzhenxing
|
549343e721
|
[图鉴]=========添加公用获取英雄品质图片方法
|
2022-01-11 13:56:45 +08:00 |
jiaoyangna
|
8ae14c38fa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 13:49:38 +08:00 |
jiaoyangna
|
b0e7ce6238
|
代码漏提
|
2022-01-11 13:49:18 +08:00 |
jiaoyangna
|
12cdbed48c
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 13:48:54 +08:00 |
ZhangBiao
|
e3c1c348e7
|
【家园】特权剩余时间修改
|
2022-01-11 13:29:58 +08:00 |
ZhangBiao
|
d0bdfb935c
|
【家园】特权增加文字提示条目
|
2022-01-11 13:25:18 +08:00 |
jiaoyangna
|
041f21d530
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 12:02:20 +08:00 |
jiaoyangna
|
8e7a0eb4fa
|
适配修改提交
|
2022-01-11 12:02:02 +08:00 |
ZhangBiao
|
68a2995780
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 11:29:54 +08:00 |
gaoxin
|
c984a101ac
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 09:47:24 +08:00 |
gaoxin
|
1d3f9ad425
|
【四灵编队】开始战斗报错
|
2022-01-14 09:47:18 +08:00 |
gaoxin
|
d67f8cd2fa
|
【云梦豪礼】添加198裆位
|
2022-01-13 17:34:51 +08:00 |
ZhangBiao
|
f94e79b6e2
|
【百宝商会】新增跳转
|
2022-01-11 11:29:43 +08:00 |
jiaoyangna
|
6bb00a785c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 11:28:58 +08:00 |
jiaoyangna
|
ec6e504546
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 11:18:07 +08:00 |
jiaoyangna
|
40e37473dc
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 11:09:44 +08:00 |
ZhangBiao
|
c40be4411d
|
【家园】特权时间显示跳帧
|
2022-01-10 18:22:20 +08:00 |
ZhangBiao
|
893a8dd10b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-10 17:38:20 +08:00 |
ZhangBiao
|
567f5c1aa0
|
【家园】升级倒计时显示错误修改
|
2022-01-10 17:38:02 +08:00 |
ZhangBiao
|
fa5d4001a2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-10 17:24:50 +08:00 |
ZhangBiao
|
cc3791e0d5
|
【家园】修改到达上线提示文字、红点修改
|
2022-01-10 17:24:39 +08:00 |
jiaoyangna
|
2ef2c0d82e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-10 16:59:42 +08:00 |
jiaoyangna
|
62d30279c3
|
资源提交
|
2022-01-10 16:59:19 +08:00 |
gaoxin
|
28df447f1a
|
【限时升星】红点刷新不及时
|
2022-01-10 16:30:01 +08:00 |
ZhangBiao
|
5b796d8246
|
【命格】红点显示不正确
|
2022-01-10 15:48:38 +08:00 |
ZhangBiao
|
6b2860c5f4
|
【命格】获得命石后,有可穿戴入口没红点
|
2022-01-10 15:38:20 +08:00 |
ZhangBiao
|
2455410a0c
|
【命格】镶嵌按钮显示穿戴
|
2022-01-10 15:29:37 +08:00 |