ZhangBiao
|
70d3fcfe9f
|
断器阁动效增加
|
2020-09-04 17:03:37 +08:00 |
jiaoyangna
|
7dbf679a40
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 16:55:27 +08:00 |
jiaoyangna
|
5a861862d5
|
商店添加动画
|
2020-09-04 16:54:58 +08:00 |
JieLing
|
86feac0023
|
Merge branch 'master_develop' into master_tishen_hw
# Conflicts:
# ProjectSettings/ProjectSettings.asset
|
2020-09-04 15:08:23 +08:00 |
ZhangBiao
|
70f553b732
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 14:35:25 +08:00 |
ZhangBiao
|
502fa23bd1
|
关两个垃圾log
|
2020-09-04 14:35:18 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
zhangqiang
|
82b1d2595a
|
Merge branch 'master_develop' into master_tishen_hw
|
2020-09-04 13:47:12 +08:00 |
zhangqiang
|
1c59eb5ff4
|
编队提示文字适配
|
2020-09-04 11:33:33 +08:00 |
gaoxin
|
18f5055d20
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 10:26:03 +08:00 |
gaoxin
|
f7d939b016
|
关闭登录流程
|
2020-09-04 10:25:40 +08:00 |
zhangqiang
|
6d15b0171e
|
工会副本
|
2020-09-04 10:23:57 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
gaoxin
|
e6e5c39cdd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 19:50:44 +08:00 |
gaoxin
|
d1facab9de
|
重复引用的资源路径修改
|
2020-09-03 19:50:26 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
ZhangBiao
|
14ce57d5f0
|
|
2020-09-03 17:54:13 +08:00 |
zhangqiang
|
ca67dc9457
|
louti
|
2020-09-03 16:45:40 +08:00 |
zhangqiang
|
8827fccbaf
|
去掉编队索引赋值
|
2020-09-03 16:43:08 +08:00 |
jiaoyangna
|
a372dd7a5e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 16:32:26 +08:00 |
jiaoyangna
|
2f9c449e31
|
新手引导预设修改
|
2020-09-10 16:32:19 +08:00 |
ZhangBiao
|
dbb941851c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 16:30:35 +08:00 |
ZhangBiao
|
c51e180255
|
十绝阵界面适配调整、修改排行单位错误
|
2020-09-03 16:30:28 +08:00 |
zhangqiang
|
352f338abe
|
界面战力不一致
|
2020-09-03 16:03:14 +08:00 |
ZhangBiao
|
5b0a96c40f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 15:14:22 +08:00 |
jiaoyangna
|
8a84e8feaa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 15:08:20 +08:00 |
jiaoyangna
|
36b66f03e1
|
【破阵诛仙】 在线结束,主城入口显示0000不消失,点击入口黑屏
|
2020-09-10 15:08:13 +08:00 |
ZhangBiao
|
3e46c0804c
|
特权商城礼包顺序问题修复
|
2020-09-03 15:14:08 +08:00 |
ZhangBiao
|
b7f59ef2fe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 14:42:41 +08:00 |
ZhangBiao
|
04b18aa4ad
|
竞技场有免费次数 时提示红点
|
2020-09-03 14:42:31 +08:00 |
wangzhenxing
|
3232e4126f
|
effect: 116 兼容金翅大鹏10星天赋
|
2020-09-03 15:20:27 +09:00 |
jiaoyangna
|
cf0cd114fe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 14:13:48 +08:00 |
jiaoyangna
|
6a951e8fd7
|
神将,进阶提交
|
2020-09-03 14:12:32 +08:00 |
zhangqiang
|
b6c47a3762
|
当车迟抢夺编队为空时前端直接弹结果
|
2020-09-03 15:58:00 +08:00 |
gaoxin
|
71851d1662
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 11:37:40 +08:00 |
gaoxin
|
bc982203a8
|
界面适配调整
|
2020-09-03 11:37:36 +08:00 |
jiaoyangna
|
bd2bce5474
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 10:55:34 +08:00 |
jiaoyangna
|
ce839831d7
|
【提示优化】修改处于多个编队的神将作为进阶材料、以及进行神将置换时的文字提示
|
2020-09-03 10:55:16 +08:00 |
ZhangBiao
|
c3b0f590d2
|
好友增加一键领取红点
|
2020-09-03 10:50:25 +08:00 |
gaoxin
|
6e400a4db1
|
屏幕适配提交
|
2020-09-02 22:29:33 +08:00 |
gaoxin
|
b2d9620c73
|
界面适配修改
|
2020-09-02 19:30:56 +08:00 |
wangzhenxing
|
9473b158e4
|
释放技能逻辑修改,如果角色在释放技能前死了就把队列里要释放的技能都不做处理,只有死亡后才触发的技能才会释放和有不灭的英雄的技能
|
2020-09-02 19:01:11 +09:00 |
ZhangBiao
|
5959deaefa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 18:33:45 +08:00 |
ZhangBiao
|
3c0c8e3f15
|
【页签优化】部分页签设定按照玩家等级开启
|
2020-09-02 18:33:17 +08:00 |
zhangqiang
|
4c000c6cb3
|
shipei
|
2020-09-02 18:27:03 +08:00 |
jiaoyangna
|
b7abe8edd6
|
hero compound
|
2020-09-02 18:07:20 +08:00 |
jiaoyangna
|
d40da31aad
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua
|
2020-09-02 18:01:01 +08:00 |
jiaoyangna
|
7342bc3bd9
|
commit
|
2020-09-02 17:59:39 +08:00 |
zhangqiang
|
571b8e082a
|
shipei
|
2020-09-02 17:38:56 +08:00 |
gaoxin
|
3df07f557c
|
合成界面屏幕适配修改
|
2020-09-02 17:31:49 +08:00 |
jiaoyangna
|
b97569c645
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 17:22:22 +08:00 |
jiaoyangna
|
d2e94cfdea
|
hero compound and replace
|
2020-09-02 17:21:54 +08:00 |
gaoxin
|
01d215097b
|
修复新的ui结构导致引导报错的问题
|
2020-09-02 17:10:19 +08:00 |
gaoxin
|
ae1ed4b001
|
月卡界面屏幕适配修改,
|
2020-09-02 16:46:38 +08:00 |
gaoxin
|
541d4277c7
|
部分界面屏幕适配修改
|
2020-09-02 16:11:53 +08:00 |
ZhangBiao
|
58540f1556
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 16:10:40 +08:00 |
ZhangBiao
|
926f8d7669
|
一件添加好友和添加界面调整
|
2020-09-02 16:10:32 +08:00 |
jiaoyangna
|
5b68ae2cb9
|
tujian commit
|
2020-09-12 14:12:26 +08:00 |
jiaoyangna
|
f0d60cfca0
|
tujian commit
|
2020-09-02 15:36:45 +08:00 |
jiaoyangna
|
35712b99de
|
xuanyuan commit
|
2020-09-02 15:31:02 +08:00 |
jiaoyangna
|
bb43d526b2
|
【背包优化】无可分解装备和魂印时添加提示
|
2020-09-02 14:47:53 +08:00 |
gaoxin
|
1f3ba7abf7
|
充值,首充,幸运探宝界面适配修改
|
2020-09-02 14:44:07 +08:00 |
zhangqiang
|
1908ce2ee8
|
破阵诛仙
|
2020-09-02 14:07:57 +08:00 |
zhangqiang
|
9d757ba068
|
适配
|
2020-09-02 13:45:14 +08:00 |
ZhangBiao
|
39e9728561
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
|
2020-09-02 13:36:17 +08:00 |
jiaoyangna
|
f8e5364152
|
【图鉴优化】取消图鉴界面的全部分类
|
2020-09-09 11:10:47 +08:00 |
jiaoyangna
|
8d11549d86
|
大闹天宫红点修改
|
2020-09-09 10:30:39 +08:00 |
jiaoyangna
|
730c2719a5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:11:52 +08:00 |
jiaoyangna
|
8d19f5c583
|
prefab commit
|
2020-09-09 10:11:47 +08:00 |
ZhangBiao
|
e3e95e2379
|
森罗 无尽 流程优化和界面调整
|
2020-09-02 13:35:29 +08:00 |
zhangqiang
|
e845bc5fe1
|
车迟 十绝阵 英雄详情 适配
|
2020-09-02 09:49:17 +08:00 |
jiaoyangna
|
933aadbf65
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 18:36:18 +08:00 |
jiaoyangna
|
00b75cc097
|
prefab commit
|
2020-09-01 18:36:14 +08:00 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
zhangqiang
|
c4bc262356
|
图鉴 编队 开服
|
2020-09-01 16:54:07 +08:00 |
zhangqiang
|
51e88c5f34
|
寻宝自动选择逻辑修改
|
2020-09-01 16:45:11 +08:00 |
ZhangBiao
|
895f4fcbc8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 15:32:43 +08:00 |
ZhangBiao
|
91061ae00a
|
无尽红点刷新修复
|
2020-09-01 15:32:24 +08:00 |
gaoxin
|
b939439eb2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 15:31:11 +08:00 |
gaoxin
|
3d3a51fbb0
|
重连和登录时断开之前的socket连接
|
2020-09-01 15:31:06 +08:00 |
ZhangBiao
|
4dbbdbd54b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 14:53:42 +08:00 |
ZhangBiao
|
822f4a2294
|
森罗界面适配
|
2020-09-01 14:53:12 +08:00 |
gaoxin
|
c6bdebeffb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
|
2020-09-01 14:38:29 +08:00 |
gaoxin
|
ae349123df
|
部分界面屏幕适配调整
|
2020-09-01 14:38:02 +08:00 |
zhangqiang
|
aabef68ccb
|
气泡提交
|
2020-09-01 11:50:24 +08:00 |
ZhangBiao
|
0975c28ca6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 11:25:46 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
jiaoyangna
|
3a791c802e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 10:23:51 +08:00 |
jiaoyangna
|
33a6471c05
|
【宝物】共鸣界面等级上限显示不正确
|
2020-09-01 10:23:35 +08:00 |
zhangqiang
|
cf7b336eef
|
漏提
|
2020-09-01 09:37:51 +08:00 |
zhangqiang
|
a6fa4453e6
|
需求主城或关卡停留过长添加聊天气泡
|
2020-08-31 20:52:50 +08:00 |
ZhangBiao
|
69cc5d4e86
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 19:54:21 +08:00 |
ZhangBiao
|
9942bd50bb
|
回春散使用bug修复
|
2020-08-31 19:54:14 +08:00 |
zhangqiang
|
70a17dc502
|
法宝添加红点提示
|
2020-08-31 19:47:57 +08:00 |
zhangqiang
|
40610b0c19
|
献祭修改
|
2020-08-31 18:19:38 +08:00 |
gaoxin
|
63d8a08e27
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:39:22 +08:00 |
gaoxin
|
eb8cab2aeb
|
修复商店物品购买所需物品商品数量和拥有的数量相同时会显示不可购买的问题
|
2020-08-31 17:39:18 +08:00 |
zhangqiang
|
081dd22758
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:19:27 +08:00 |
zhangqiang
|
595df16baf
|
公会副本添加提示判断
|
2020-08-31 17:19:14 +08:00 |
jiaoyangna
|
9e7a95788f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:10:38 +08:00 |