ZhangBiao
|
ab6aa7dfbe
|
【优化】 百宝商会界面优化
|
2021-11-05 10:42:26 +08:00 |
jiaoyangna
|
5ac1f04718
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:18:28 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
ZhangBiao
|
4cb826b9e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 19:10:24 +08:00 |
ZhangBiao
|
08e6f334a4
|
【装备界面】特效调整
|
2021-11-04 19:10:06 +08:00 |
gaoxin
|
671de83349
|
【天书密卷】修复返回按钮和页签遮挡问题
|
2021-11-04 18:10:18 +08:00 |
ZhangBiao
|
5f28703681
|
【法宝界面】法宝描述超框修改
|
2021-11-04 16:11:27 +08:00 |
ZhangBiao
|
1321b32caf
|
【装备界面】增加特效
|
2021-11-04 15:44:59 +08:00 |
gaoxin
|
761cdeffcf
|
【周卡】策划反馈优化
|
2021-11-15 00:03:12 +08:00 |
ZhangBiao
|
dd0801e149
|
【界面优化】技能描述
|
2021-11-04 11:43:24 +08:00 |
ZhangBiao
|
4f19c5eaaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 11:30:20 +08:00 |
ZhangBiao
|
0aa460f151
|
【界面优化】技能具中
|
2021-11-04 11:30:10 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
34d8cf4440
|
神魂位置提交
|
2021-11-04 09:27:56 +08:00 |
jiaoyangna
|
4941110a7b
|
神魂提交
|
2021-11-03 18:38:13 +08:00 |
jiaoyangna
|
6f0d51ddb2
|
神魂提交
|
2021-11-03 18:11:08 +08:00 |
ZhangBiao
|
38544fd273
|
【逍遥游】触发仙缘界面中,事件图标显示不对
|
2021-11-03 17:12:20 +08:00 |
jiaoyangna
|
358f9e13ba
|
底修改提交
|
2021-11-03 16:26:07 +08:00 |
gaoxin
|
24c550cee5
|
Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
# Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
|
2021-11-03 16:09:31 +08:00 |
jiaoyangna
|
4eed456628
|
神魂图标修改
|
2021-11-03 13:25:08 +08:00 |
jiaoyangna
|
604b1d6819
|
神魂提交
|
2021-11-03 11:18:37 +08:00 |
jiaoyangna
|
0468c865db
|
神魂提交
|
2021-11-03 10:32:55 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
ZhangBiao
|
68f92b5bd0
|
【山河社稷图】提交
|
2021-11-02 18:56:45 +08:00 |
ZhangBiao
|
46247d8224
|
【界面优化】QA界面提交
|
2021-11-02 17:04:17 +08:00 |
ZhangBiao
|
81dadae61f
|
【界面优化】提交
|
2021-11-02 16:58:48 +08:00 |
ZhangBiao
|
f12a83ec53
|
【山河社稷图优化】关卡编队界面显示三星条件(主关卡)和特殊要求(副关卡)
|
2021-11-02 16:24:01 +08:00 |
ZhangBiao
|
672fcaf974
|
【界面优化】魂印图鉴界面
|
2021-11-02 15:14:19 +08:00 |
ZhangBiao
|
7eb3eeb351
|
【道具来源】界面错位修改
|
2021-11-02 14:47:27 +08:00 |
ZhangBiao
|
9303bfc856
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 14:31:30 +08:00 |
ZhangBiao
|
b634ce0d87
|
【界面优化】提交
|
2021-11-02 14:31:18 +08:00 |
jiaoyangna
|
eec3703429
|
预设漏提
(cherry picked from commit a5aa425168)
|
2021-11-02 14:25:12 +08:00 |
jiaoyangna
|
a5aa425168
|
预设漏提
|
2021-11-02 14:24:27 +08:00 |
jiaoyangna
|
9e422d1772
|
玲珑宝镜修改提交
(cherry picked from commit eef7fbacdf)
|
2021-11-02 14:21:32 +08:00 |
jiaoyangna
|
eef7fbacdf
|
玲珑宝镜修改提交
|
2021-11-02 14:20:27 +08:00 |
ZhangBiao
|
0e5e559220
|
【界面优化】法宝归元
|
2021-11-02 13:52:48 +08:00 |
ZhangBiao
|
1e203c822c
|
【界面优化】好感度,天枢密卷
|
2021-11-02 13:41:27 +08:00 |
ZhangBiao
|
68525db92e
|
【界面优化】提交
|
2021-11-02 11:06:13 +08:00 |
ZhangBiao
|
2b1c935d34
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 10:28:01 +08:00 |
ZhangBiao
|
16b65a6c8b
|
【神将来源】界面偏移修改
|
2021-11-02 10:27:48 +08:00 |
gaoxin
|
351e51eb0b
|
【灵兽】修复巨鲲获取界面文字遮挡
|
2021-11-02 10:26:26 +08:00 |
ZhangBiao
|
8a9d52656f
|
【界面优化】山河社稷图、仙缘汇聚箱
|
2021-11-02 09:29:07 +08:00 |
jiaoyangna
|
e049612d3a
|
Merge branch '0功能/神魂' of http://60.1.1.230/gaoxin/JL_Client into 0功能/神魂
|
2021-11-01 19:12:18 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
0c1044ab67
|
Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce.
|
2021-11-01 18:59:21 +08:00 |
gaoxin
|
31264fff91
|
Revert "Revert "【界面优化】剧情界面、引导、itemview、邮件、背包""
This reverts commit 317895ecaf.
|
2021-11-01 18:59:16 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489.
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392.
|
2021-11-01 18:53:54 +08:00 |
zhangshanxue
|
317895ecaf
|
Revert "【界面优化】剧情界面、引导、itemview、邮件、背包"
This reverts commit bd6a5f887d.
|
2021-11-01 18:53:45 +08:00 |
zhangshanxue
|
d2c8daffce
|
Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73.
|
2021-11-01 18:53:39 +08:00 |
ZhangBiao
|
87210b9d73
|
【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法
|
2021-11-01 17:21:59 +08:00 |
ZhangBiao
|
bd6a5f887d
|
【界面优化】剧情界面、引导、itemview、邮件、背包
|
2021-11-01 16:19:22 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
wangzhenxing
|
d004e1d459
|
【神魂】======战斗中 和伤害记录界面加神魂显示
|
2021-10-29 15:14:01 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
jiaoyangna
|
c735599c77
|
至尊降世报错修改提价
|
2021-10-29 12:05:01 +08:00 |
jiaoyangna
|
d6c766db52
|
战斗界面星级修改提交
|
2021-10-29 11:22:34 +08:00 |
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 |
ZhangBiao
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
jiaoyangna
|
7d1f1d7f01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 11:17:27 +08:00 |
gaoxin
|
b2a163ae3d
|
【百宝商会第二季】预设上传
|
2021-10-19 19:01:40 +08:00 |
ZhangBiao
|
a387432369
|
【主角修为】提交
|
2021-10-19 18:34:10 +08:00 |
gaoxin
|
7a9cdc15b2
|
Merge branch '0功能/山河社稷图每日奖励' into china/dev
|
2021-10-19 18:02:20 +08:00 |
gaoxin
|
e01b39c8a4
|
【山河每日奖励】优化宝箱显示
|
2021-10-19 18:01:50 +08:00 |
ZhangBiao
|
2d982e67d3
|
【主角修为】提交
|
2021-10-19 15:34:43 +08:00 |
gaoxin
|
e647486e07
|
【战斗】失败界面我要变强按钮资源修改-预设修改
|
2021-10-19 14:05:02 +08:00 |
ZhangBiao
|
bbc98ac478
|
【牛气冲天】进度显示不全修复
|
2021-10-19 13:35:10 +08:00 |
jiaoyangna
|
47a5fe6e3f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 13:25:21 +08:00 |
jiaoyangna
|
005468635f
|
页签添加红点
|
2021-10-19 13:25:08 +08:00 |
gaoxin
|
89d93783b7
|
【优化】每日豪礼充值以后没有红点提示领取
|
2021-10-19 11:08:35 +08:00 |
jiaoyangna
|
1f077cbcdc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:04:25 +08:00 |
jiaoyangna
|
c091c55bef
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-19 11:04:06 +08:00 |
gaoxin
|
a23791e07c
|
【战斗】失败界面添加我要变强跳转
|
2021-10-19 10:46:12 +08:00 |
ZhangBiao
|
99fb560ca2
|
【七界试炼】上下层按钮调整
|
2021-10-19 10:12:41 +08:00 |
wangzhenxing
|
54b07410bf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-19 10:12:38 +08:00 |
wangzhenxing
|
b5f27a64af
|
主角技能提交
|
2021-10-19 10:00:34 +08:00 |
ZhangBiao
|
a9e430c755
|
【七界试炼】【优化】七界试炼优化上下层提示
|
2021-10-19 09:33:37 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
gaoxin
|
334090870d
|
【挚礼月卡】修复按钮事件遮挡
|
2021-10-18 16:21:19 +08:00 |
gaoxin
|
c9ccd9932b
|
【挚礼月卡】预制体修改
|
2021-10-18 15:28:43 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
jiaoyangna
|
b50e5ee2bf
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-18 10:38:49 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
wangzhenxing
|
35c1987c26
|
Merge branch '0功能/玉虚论道' into china/dev
|
2021-10-18 09:59:26 +08:00 |
wangzhenxing
|
23438def99
|
对战信息界面添加动效
|
2021-10-16 19:31:03 +08:00 |
ZhangBiao
|
27e433ca6b
|
【牛气冲天】增加进度
|
2021-10-16 16:37:44 +08:00 |
ZhangBiao
|
0aef47cc9f
|
【牛气冲天、灵兽宝阁】点击奖励显示错误修改
|
2021-10-16 16:00:34 +08:00 |
ZhangBiao
|
45b9f3f3bb
|
【御剑行】增加特效
|
2021-10-16 15:08:29 +08:00 |
jiaoyangna
|
6cae26f8bb
|
红点位置修改提交
|
2021-10-16 14:48:18 +08:00 |
ZhangBiao
|
7e5f122a11
|
【适配】1080*2550 觉醒成功界面文字被切
|
2021-10-16 13:54:50 +08:00 |
jiaoyangna
|
01fb1af93f
|
【ID1010483】
【优化】挂机界面,额外加成改为整数值,且更换资源文件
|
2021-10-15 18:07:07 +08:00 |
jiaoyangna
|
e026881024
|
ID1010484】
易经宝库可选奖励优化
|
2021-10-15 14:35:57 +08:00 |
ZhangBiao
|
a16b8c5e75
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-15 14:06:35 +08:00 |
ZhangBiao
|
11bf1918dc
|
【御剑行】提交问好
|
2021-10-15 14:06:18 +08:00 |
ZhangBiao
|
35eb36384e
|
【御剑行】提交
|
2021-10-15 11:15:42 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
jiaoyangna
|
101f406a4c
|
【ID1010469】
好感度优化
|
2021-10-14 20:15:53 +08:00 |
ZhangBiao
|
4d911a4ea4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 18:28:55 +08:00 |
ZhangBiao
|
46d38b01ec
|
【御剑行】提交
|
2021-10-14 18:02:30 +08:00 |
jiaoyangna
|
9e46ffd910
|
神将天赋界面修改提交
|
2021-10-14 17:14:51 +08:00 |
ZhangBiao
|
cd04fc3d37
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 17:11:12 +08:00 |
wangzhenxing
|
072c44d495
|
[bug]======【ID1018713】
【成就】战力目标成就进度超框,需要改为缩写
|
2021-10-14 16:35:34 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
ZhangBiao
|
8ad554a64d
|
【御剑行】提交
|
2021-10-14 16:10:54 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
jiaoyangna
|
3cbffeab4a
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-14 12:14:26 +08:00 |
ZhangBiao
|
4eb6e1d9ae
|
【御剑行】提交
|
2021-10-14 11:25:44 +08:00 |
ZhangBiao
|
2101e974ad
|
【御剑行】增加投注滑动条
|
2021-10-14 09:53:51 +08:00 |
wangzhenxing
|
7dce99c08c
|
玉虚修改
|
2021-10-13 19:35:30 +08:00 |
ZhangBiao
|
bb9533781d
|
【御剑行】提交
|
2021-10-13 19:15:39 +08:00 |
ZhangBiao
|
018c09d69c
|
【御剑行】竞猜,差一个三级弹窗
|
2021-10-13 17:30:26 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
jiaoyangna
|
25f3f927d6
|
位置修改提交
|
2021-10-12 17:51:04 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
jiaoyangna
|
3f92309d78
|
好感度添加特效
|
2021-10-12 16:33:10 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
jiaoyangna
|
60b53f2d7b
|
神将详情,装备修改提交
|
2021-10-12 15:32:07 +08:00 |
jiaoyangna
|
e70329e605
|
神将详情显示错误修改
|
2021-10-12 14:54:12 +08:00 |
ZhangBiao
|
359ca6b299
|
【御剑行】提交
|
2021-10-12 11:26:48 +08:00 |
jiaoyangna
|
fb0aec52e6
|
好感度优化
|
2021-10-12 10:05:10 +08:00 |
ZhangBiao
|
99d80454f5
|
【御剑行】增加开始动画
|
2021-10-11 17:25:48 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
ZhangBiao
|
a0911448b2
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-09 18:18:32 +08:00 |
ZhangBiao
|
110a6d64c0
|
【御剑行】导入资源,剑
|
2021-10-09 18:17:59 +08:00 |
ZhangBiao
|
895916a53a
|
【御剑行】提交
|
2021-10-09 16:24:34 +08:00 |
jiaoyangna
|
57304e0dc3
|
ID1018685】
【好感度】挂机预览加成心形图标左右不居中,特权图标上下不居中
【ID1018687】
【好感度】赠与界面,神将名字不居中
|
2021-10-09 11:24:39 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
ZhangBiao
|
81a3db0446
|
【御剑行】提交
|
2021-10-08 15:45:28 +08:00 |
jiaoyangna
|
491c04b2a3
|
装备套装属性预设修改提交
|
2021-10-08 12:14:48 +08:00 |
wangzhenxing
|
36d542ba9d
|
玉虚论道优化提交
|
2021-09-30 15:12:02 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +08:00 |
jiaoyangna
|
cb9384efd7
|
【ID1018672】
【文字颜色不清晰】粉色心中间数字换种字体颜色
(cherry picked from commit ffde7813a0)
|
2021-09-30 11:03:14 +08:00 |
jiaoyangna
|
ffde7813a0
|
【ID1018672】
【文字颜色不清晰】粉色心中间数字换种字体颜色
|
2021-09-30 10:30:38 +08:00 |
ZhangBiao
|
660a88b965
|
【御剑行】提交
|
2021-09-29 18:34:54 +08:00 |
jiaoyangna
|
de2aa940b4
|
七界试炼预设调整
|
2021-09-29 16:55:56 +08:00 |
jiaoyangna
|
a62e656d7b
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-29 15:49:39 +08:00 |
gaoxin
|
788d18e332
|
【装备对比】背包中的装备信息界面修改
|
2021-09-28 21:00:50 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +08:00 |
jiaoyangna
|
c242b86dd2
|
好感度详情提交
|
2021-09-28 18:23:37 +08:00 |
jiaoyangna
|
5d3871ef17
|
玲珑宝镜进度条颜色修改提交
|
2021-09-28 17:49:52 +08:00 |
ZhangBiao
|
fa1c5a5dee
|
【御剑行】提交
|
2021-09-28 17:48:28 +08:00 |
jiaoyangna
|
b978377005
|
玲珑宝镜预设修改提交
|
2021-09-28 16:19:40 +08:00 |
wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
jiaoyangna
|
f4d4144ff4
|
玲珑宝镜修改提交
|
2021-09-28 15:30:06 +08:00 |
wangzhenxing
|
46efbf99db
|
战斗信息界面预设修改提交
|
2021-09-28 15:19:11 +08:00 |
jiaoyangna
|
46731f726f
|
玲珑宝镜修改提交
|
2021-09-28 11:30:44 +08:00 |