jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
ac6dca4805
|
【御剑行】赛季结束不可打开竞猜
|
2021-10-22 15:46:35 +08:00 |
ZhangBiao
|
0f0c0586bf
|
【御剑行】红点
|
2021-10-22 15:44:19 +08:00 |
ZhangBiao
|
c16004cf3b
|
【百宝商会】增加次数显示
|
2021-10-22 15:41:49 +08:00 |
ZhangBiao
|
26e980b503
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:49:08 +08:00 |
ZhangBiao
|
0d94f23e41
|
【御剑行】红点提交
|
2021-10-22 14:48:56 +08:00 |
wangzhenxing
|
7ad105855a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:44:40 +08:00 |
wangzhenxing
|
8590face13
|
【战斗】========主角技能名称图片资源提交
|
2021-10-22 14:44:11 +08:00 |
ZhangBiao
|
befea57bbc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:29:09 +08:00 |
ZhangBiao
|
7da9ee8b6d
|
【弹窗优化】邮件、每日任务
|
2021-10-22 14:28:59 +08:00 |
ZhangBiao
|
5aba21341c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:22:23 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
wangzhenxing
|
fc3edefd82
|
【战斗】=====hot buff修改提交
|
2021-10-22 14:11:25 +08:00 |
wangzhenxing
|
8035e3f6f3
|
[战斗]==============战斗消息位置修改
|
2021-10-22 14:04:15 +08:00 |
wangzhenxing
|
eefaa33687
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:59:08 +08:00 |
wangzhenxing
|
e0b7df4206
|
[战斗]==========被动199 历战之躯 被动修改 2
|
2021-10-22 13:57:51 +08:00 |
ZhangBiao
|
609b191785
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:53:22 +08:00 |
liujiaqi
|
8aa08bd13a
|
【资源】主角字
|
2021-11-02 13:49:02 +08:00 |
ZhangBiao
|
22941d0af5
|
【弹窗优化】公会、公告、服务器列表】英雄信息
|
2021-10-22 13:53:10 +08:00 |
wangzhenxing
|
2a6f3389b3
|
[战斗]=============被动199 历战之躯 修改
|
2021-10-22 13:35:44 +08:00 |
ZhangBiao
|
cdc17b555e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:22:51 +08:00 |
ZhangBiao
|
31e8f4c726
|
【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗
|
2021-10-22 13:22:39 +08:00 |
wangzhenxing
|
d93e0a9c4e
|
角色技能升级按钮添加动效
|
2021-10-22 13:15:08 +08:00 |
wangzhenxing
|
73361ef6c9
|
玉虚奖励预设修改提交
|
2021-10-22 12:09:10 +08:00 |
gaoxin
|
7b486f1559
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-23 03:01:26 +08:00 |
gaoxin
|
25a14f7a79
|
【商店】免费次数的商店,取消刷新后今日不再显示满次红点的功能,满次后刷新红点显示添加
|
2021-10-23 03:01:20 +08:00 |
gaoxin
|
582ab51299
|
【山河社稷图】每日奖励文字修改
|
2021-10-22 21:25:49 +08:00 |
wangzhenxing
|
4518c8c175
|
修行技能bug修改提交
|
2021-10-22 11:56:46 +08:00 |
ZhangBiao
|
7b20915c6c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 11:27:58 +08:00 |
ZhangBiao
|
39aa09f317
|
【点击黑色区域关闭】
|
2021-10-22 11:27:47 +08:00 |
ZhangBiao
|
e48606b648
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 11:21:53 +08:00 |
ZhangBiao
|
1215e46af8
|
【御剑行】点击商店返回后增加请求
|
2021-10-22 11:21:42 +08:00 |
jiaoyangna
|
bfd2e06ecc
|
至尊降世修改提交
|
2021-10-22 11:20:24 +08:00 |
ZhangBiao
|
abbcc52f01
|
【御剑行】提交
|
2021-10-22 10:57:01 +08:00 |
ZhangBiao
|
fa818dac35
|
【御剑行】提交
|
2021-10-22 10:41:20 +08:00 |
ZhangBiao
|
9fd8d6d886
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:25:36 +08:00 |
ZhangBiao
|
a732dadb5f
|
【御剑行】修改提交
|
2021-10-22 10:25:20 +08:00 |
wangzhenxing
|
eb5867b31c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:21:36 +08:00 |
wangzhenxing
|
c494145ff8
|
主角技能添加屏蔽
|
2021-10-22 10:21:07 +08:00 |
ZhangBiao
|
19d4f27f76
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:20:42 +08:00 |
ZhangBiao
|
85819fcbae
|
【御剑行】红点调整
|
2021-10-22 10:20:30 +08:00 |
wangzhenxing
|
ae47df29bb
|
【红点】=============修行技能红点提交
|
2021-10-22 10:08:53 +08:00 |
ZhangBiao
|
747cb5b179
|
【御剑行】修改提交
|
2021-10-22 10:00:19 +08:00 |
ZhangBiao
|
d8da0bb26a
|
【协议】补提
|
2021-10-22 09:33:54 +08:00 |
ZhangBiao
|
cef99194af
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 09:26:20 +08:00 |
ZhangBiao
|
2ab4be658d
|
【主角修为】图标顺序调整
|
2021-10-22 09:26:09 +08:00 |
jiaoyangna
|
68cbb5905a
|
至尊降世修改提交
|
2021-10-21 18:58:36 +08:00 |
jiaoyangna
|
4e89351ef8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 18:12:41 +08:00 |
jiaoyangna
|
b24061ccd0
|
至尊降世报错修改提交
|
2021-10-21 18:12:28 +08:00 |