ZhangBiao
|
c1f3658da4
|
【界面优化】提交
|
2021-10-29 11:13:29 +08:00 |
gaoxin
|
0fcf94a9c8
|
【周卡】协议,界面,逻辑搭建完成
|
2021-10-29 09:42:33 +08:00 |
wangzhenxing
|
c43667aa67
|
【玉虚论道】=======主界面按钮位置修改提交
|
2021-10-28 16:53:49 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
ZhangBiao
|
0903782f0e
|
【界面优化】法宝界面错位调整
|
2021-10-28 16:51:00 +08:00 |
ZhangBiao
|
ab2b32a35f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 16:41:06 +08:00 |
ZhangBiao
|
871b2ad23b
|
【界面优化】大闹天宫调整
|
2021-10-28 16:40:54 +08:00 |
wangzhenxing
|
345230b0cc
|
【玉虚论道】======预设修改提交
|
2021-10-28 16:25:35 +08:00 |
jiaoyangna
|
9249ed85cb
|
神魂预设修改
|
2021-10-28 16:19:59 +08:00 |
ZhangBiao
|
5e0e41f7bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 16:03:33 +08:00 |
ZhangBiao
|
79f7339a3a
|
【三界降魔】提交
|
2021-10-28 16:03:23 +08:00 |
wangzhenxing
|
9f377eb364
|
[玉虚论道]==========功能按钮大小修改提交
|
2021-10-28 15:42:13 +08:00 |
jiaoyangna
|
f4d9f0487d
|
神魂
|
2021-10-28 15:30:47 +08:00 |
ZhangBiao
|
695dd0459a
|
【周卡】
|
2021-10-28 15:22:17 +08:00 |
ZhangBiao
|
134bb86342
|
【界面优化】
|
2021-10-28 14:57:50 +08:00 |
ZhangBiao
|
79043d7c24
|
【界面优化】大闹天宫
|
2021-10-28 14:43:23 +08:00 |
ZhangBiao
|
8364c654b7
|
【界面优化】大闹天宫
|
2021-10-28 14:19:00 +08:00 |
ZhangBiao
|
87a95f0612
|
【界面优化】还原”特性“、大闹天宫
|
2021-10-28 14:14:30 +08:00 |
jiaoyangna
|
fb8fefd12b
|
加分割线
|
2021-10-28 11:19:39 +08:00 |
jiaoyangna
|
58044a3e91
|
神魂界面星星修改提交
|
2021-10-28 11:07:50 +08:00 |
ZhangBiao
|
ef79b1d170
|
【界面优化】送神、归元、法宝
|
2021-10-28 09:47:24 +08:00 |
ZhangBiao
|
9ac870db81
|
Merge branch 'china/dev' into 0优化/界面优化
|
2021-10-28 09:34:12 +08:00 |
ZhangBiao
|
429366fa93
|
【三界降魔】调改
|
2021-10-27 18:26:51 +08:00 |
ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
ZhangBiao
|
19a67875f8
|
【界面优化】大闹天宫部分
|
2021-10-27 13:45:05 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
ZhangBiao
|
36f26dc0cb
|
【界面优化】抽到灵兽
|
2021-10-27 10:45:59 +08:00 |
ZhangBiao
|
ac23ef4dbd
|
【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面
|
2021-10-27 10:37:29 +08:00 |
ZhangBiao
|
f8a0a76d75
|
【界面优化】灵兽技能、英雄传说
|
2021-10-27 09:54:42 +08:00 |
ZhangBiao
|
2f8ad786f5
|
【界面优化】HelpPopup
|
2021-10-26 18:30:32 +08:00 |
ZhangBiao
|
490f566b4d
|
【界面优化】技能
|
2021-10-26 18:23:32 +08:00 |
ZhangBiao
|
779cb4d99e
|
【界面优化】技能
|
2021-10-26 18:18:36 +08:00 |
ZhangBiao
|
d5cf1c5395
|
【界面优化】归元、技能
|
2021-10-26 17:55:49 +08:00 |
ZhangBiao
|
353a9774c5
|
【界面优化】定位、恭送
|
2021-10-26 17:36:08 +08:00 |
ZhangBiao
|
e29dd36c26
|
【界面优化】法宝界面
|
2021-10-26 16:33:20 +08:00 |
jiaoyangna
|
edcdd0e81e
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-26 16:01:24 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
wangzhenxing
|
c48a16bb6c
|
[主角技能]=====技能升级界面预设修改提交
|
2021-10-26 15:17:17 +08:00 |
jiaoyangna
|
b6475fb1b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:17:56 +08:00 |
jiaoyangna
|
3d832f81cf
|
【ID1010556】
【优化】好感度解锁等级优化
|
2021-10-26 14:17:07 +08:00 |
ZhangBiao
|
26b5a670f9
|
【界面优化】背包装备优化
|
2021-10-26 14:04:02 +08:00 |
ZhangBiao
|
f51c80b277
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 18:40:33 +08:00 |
ZhangBiao
|
7332c761b8
|
【御剑行】错别字
|
2021-10-25 18:40:22 +08:00 |
wangzhenxing
|
fbf66138ca
|
[玉虚论道]======玉虚段位奖励界面特效层级修改提交
|
2021-10-25 17:19:01 +08:00 |
gaoxin
|
102c24cd8e
|
【至尊降世】文字遮挡优化
|
2021-10-25 14:53:32 +08:00 |
ZhangBiao
|
7871064069
|
【修为】Tips修改
|
2021-10-25 11:54:04 +08:00 |
ZhangBiao
|
b267ad30c6
|
【百宝商会】取消QA
|
2021-10-25 10:47:12 +08:00 |
ZhangBiao
|
60e71f5e42
|
【御剑行】哎,提交
|
2021-10-22 18:20:08 +08:00 |
ZhangBiao
|
cc2cfd7a21
|
【百宝商会、御剑行】按钮一致性提交、显示修改
|
2021-10-22 18:15:55 +08:00 |
ZhangBiao
|
de2ce6919c
|
【御剑行】提交
|
2021-10-22 17:58:07 +08:00 |
ZhangBiao
|
2bb589b5dd
|
【御剑行】竞猜界面点击任意位置关闭修改
|
2021-10-22 17:45:46 +08:00 |
ZhangBiao
|
0508d1d652
|
【御剑行】跨期修改
|
2021-10-22 16:47:30 +08:00 |
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
|
c16004cf3b
|
【百宝商会】增加次数显示
|
2021-10-22 15:41:49 +08:00 |
ZhangBiao
|
7da9ee8b6d
|
【弹窗优化】邮件、每日任务
|
2021-10-22 14:28:59 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
ZhangBiao
|
22941d0af5
|
【弹窗优化】公会、公告、服务器列表】英雄信息
|
2021-10-22 13:53:10 +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 |
wangzhenxing
|
4518c8c175
|
修行技能bug修改提交
|
2021-10-22 11:56:46 +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 |
wangzhenxing
|
ae47df29bb
|
【红点】=============修行技能红点提交
|
2021-10-22 10:08:53 +08:00 |
ZhangBiao
|
747cb5b179
|
【御剑行】修改提交
|
2021-10-22 10:00:19 +08:00 |
jiaoyangna
|
68cbb5905a
|
至尊降世修改提交
|
2021-10-21 18:58:36 +08:00 |
jiaoyangna
|
ad84124cd9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 18:00:20 +08:00 |
jiaoyangna
|
bdb8510d92
|
坐骑界面修改提交
|
2021-10-21 18:00:05 +08:00 |
ZhangBiao
|
e3b9c82ac7
|
【七界试炼】左右按钮在调整
|
2021-10-21 17:55:11 +08:00 |
ZhangBiao
|
869b65dd95
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
|
2021-10-21 17:47:34 +08:00 |
ZhangBiao
|
96860e358c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:46:34 +08:00 |
ZhangBiao
|
42618596e1
|
【七界试炼】按钮显隐提交
|
2021-10-21 17:46:23 +08:00 |
jiaoyangna
|
36b574a645
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:39:09 +08:00 |
jiaoyangna
|
8fa8a9d690
|
至尊降世界面修改提交
|
2021-10-21 17:38:53 +08:00 |
ZhangBiao
|
a6ebd138e4
|
【新百宝商会】提交
|
2021-10-21 17:28:53 +08:00 |
wangzhenxing
|
c131aa96b4
|
[qijie]button
|
2021-10-21 16:12:59 +08:00 |
ZhangBiao
|
bf82ae5d9e
|
【七界试炼】按钮调整2
(cherry picked from commit da71c81536)
|
2021-10-21 15:16:28 +08:00 |
ZhangBiao
|
da71c81536
|
【七界试炼】按钮调整2
|
2021-10-21 15:15:55 +08:00 |
ZhangBiao
|
448ec131e8
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-10-21 13:07:13 +08:00 |
wangzhenxing
|
bb849d4b93
|
主角技能界面修改
|
2021-10-21 11:58:33 +08:00 |
ZhangBiao
|
984bb12611
|
【主角修为】问号文字调整
|
2021-10-21 11:14:24 +08:00 |
ZhangBiao
|
205200268d
|
【主角修为】提交
|
2021-10-21 10:58:09 +08:00 |
wangzhenxing
|
a17242b0c0
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
Assets/ManagedResources/~Lua/Data/ConfigData.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-10-20 22:13:29 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
jiaoyangna
|
ce28ba9362
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 18:50:47 +08:00 |
jiaoyangna
|
5425fc980a
|
坐骑界面技能描述修改提交
|
2021-10-20 18:50:34 +08:00 |
ZhangBiao
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
jiaoyangna
|
06a8251a40
|
神魂界面提交
|
2021-10-20 18:02:09 +08:00 |
gaoxin
|
a712ddee3b
|
【挚礼月卡】功能完善
|
2021-10-20 16:36:36 +08:00 |
gaoxin
|
85b15d6cb7
|
Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡
|
2021-10-20 15:14:38 +08:00 |
ZhangBiao
|
65c676eda9
|
【主角修为】文字调整
|
2021-10-20 15:11:41 +08:00 |
ZhangBiao
|
0d8af528ff
|
【主角修为】引导提交
|
2021-10-20 15:09:59 +08:00 |
ZhangBiao
|
557b9cc523
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
|
2021-10-20 14:05:15 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |