jiaoyangna
|
58c7fd9946
|
【ID1011218】
天书秘卷功能图标位置调整
|
2022-03-10 13:48:28 +08:00 |
jiaoyangna
|
e5dde41cda
|
【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
|
2022-03-10 13:45:12 +08:00 |
张彪
|
5a416c5149
|
【车迟斗法】工会界面倒计时
|
2022-03-03 13:30:25 +08:00 |
张彪
|
5d4e85832d
|
【易经宝库】提交
|
2022-03-03 09:53:22 +08:00 |
jiaoyangna
|
a01a70e9bb
|
红点提交
|
2022-03-02 18:09:49 +08:00 |
jiaoyangna
|
3b0871ad17
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-02 18:08:56 +08:00 |
jiaoyangna
|
6b4cf31c3c
|
【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
|
2022-03-02 17:48:52 +08:00 |
张彪
|
0048bf4e79
|
【易经宝库】显示特效
|
2022-03-02 16:37:22 +08:00 |
张彪
|
d33dcb9f97
|
【装备】装备添加快捷入口到摘星阁
|
2022-03-02 14:15:13 +08:00 |
张彪
|
9a60ee25f1
|
【战力冲刺】底部页签剧中
|
2022-02-25 15:52:18 +08:00 |
张彪
|
2bb1f6a944
|
【战力冲刺】提交
|
2022-02-25 13:14:37 +08:00 |
张彪
|
6f5aad16b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-24 18:19:50 +08:00 |
张彪
|
1ae90cb549
|
【战力冲刺】修改提交
|
2022-02-24 18:19:39 +08:00 |
jiaoyangna
|
d0720e17b2
|
【ID1011178】
至尊降世活动拉到1000档
|
2022-02-23 17:24:34 +08:00 |
jiaoyangna
|
1905b3c175
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-21 18:37:18 +08:00 |
jiaoyangna
|
3ccf3c29a3
|
ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-21 18:36:21 +08:00 |
张彪
|
9345c31d8b
|
【战力冲刺】提交
|
2022-02-21 10:40:27 +08:00 |
张彪
|
b51c7b7780
|
【战力冲刺】提交
|
2022-02-18 17:02:27 +08:00 |
张彪
|
4ca27d13ad
|
【战力冲刺】提交
|
2022-02-18 16:27:49 +08:00 |
张彪
|
fe6547358c
|
【灵兽宝阁】珍奇宝阁提交
|
2022-02-18 15:19:37 +08:00 |
张彪
|
f9fca9ca93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-17 17:14:46 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
jiaoyangna
|
a76616df31
|
【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 15:13:26 +08:00 |
gaoxin
|
bfbc3b7195
|
【拍脸】寻仙招募界面显示错误修改
|
2022-02-24 16:49:19 +08:00 |
gaoxin
|
545e06c474
|
Merge branch '0功能/寻仙招募拍脸' into china/dev
|
2022-02-24 15:57:18 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
gaoxin
|
5cf3527762
|
【资源】特惠商城资源替换
|
2022-02-23 18:37:50 +08:00 |
jiaoyangna
|
e27c51ee93
|
超值返利提交
|
2022-02-11 15:57:58 +08:00 |
jiaoyangna
|
f8d55e0138
|
预设漏提
|
2022-02-11 15:09:47 +08:00 |
jiaoyangna
|
072edac018
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 11:26:51 +08:00 |
jiaoyangna
|
7e62f47ca8
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 11:26:34 +08:00 |
张彪
|
9ba115e464
|
【每日特惠修改】
|
2022-02-11 10:35:42 +08:00 |
张彪
|
b868d5ff2f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 17:53:20 +08:00 |
张彪
|
4659ad0f84
|
【活动优化】每日特惠优化
|
2022-02-10 17:53:00 +08:00 |
jiaoyangna
|
bd5d09def0
|
【ID1011132】
【活动优化】每日豪礼
|
2022-02-10 16:49:21 +08:00 |
wangzhenxing
|
e21fec89ac
|
[图鉴]===============图鉴角色信息面板预设修改
|
2022-02-08 17:30:52 +08:00 |
wangzhenxing
|
9e73d667a2
|
[战斗]========加御甲显示修改
|
2022-01-24 16:20:07 +08:00 |
jiaoyangna
|
5eca555299
|
浮生门按钮层级修改提交
|
2022-01-24 16:07:21 +08:00 |
jiaoyangna
|
0fea3d1fd4
|
节日修改提交
|
2022-01-22 14:37:01 +08:00 |
jiaoyangna
|
e3a44ff121
|
适配修改提交
|
2022-01-22 13:50:21 +08:00 |
jiaoyangna
|
a44233c365
|
节日提交
|
2022-01-22 13:34:19 +08:00 |
jiaoyangna
|
ec7be4c020
|
节日提交
|
2022-01-22 13:27:25 +08:00 |
jiaoyangna
|
5cea36a143
|
节日修改提交
|
2022-01-22 11:37:59 +08:00 |
jiaoyangna
|
227e0f68c1
|
特效提交
|
2022-01-22 11:12:47 +08:00 |
jiaoyangna
|
3a9acbdf19
|
签到好礼提交
|
2022-01-21 18:49:40 +08:00 |
jiaoyangna
|
1f4c38a710
|
显示修改
|
2022-01-21 14:27:07 +08:00 |
gaoxin
|
4c00b471ad
|
【战斗】添加头像显示
|
2022-01-21 11:59:19 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
gaoxin
|
69a1e5bca6
|
【公会成员信息界面修改】
|
2022-01-20 17:50:35 +08:00 |
wangzhenxing
|
46f337312e
|
[飞升]========特效修改
|
2022-01-20 15:06:04 +08:00 |
ZhangBiao
|
6ff00013f5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 11:55:01 +08:00 |
ZhangBiao
|
7d5c79b514
|
【排行榜】卡动画修改
|
2022-01-20 11:52:26 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
ZhangBiao
|
908cee1961
|
【神将信息】图鉴信息便宜修改
|
2022-01-19 18:30:09 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
jiaoyangna
|
76295739f3
|
【ID1019513】
【品质调整】神将技能弹窗,不关闭也可以点返回
|
2022-01-18 15:01:01 +08:00 |
jiaoyangna
|
b5cc0635ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 14:49:50 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
ZhangBiao
|
54aeaa2ea8
|
【寻仙招募】提交
|
2022-01-18 12:09:43 +08:00 |
wangzhenxing
|
ff5866e00e
|
[法宝详情]=======添加返回按钮
|
2022-01-18 11:57:38 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
wangzhenxing
|
7f9868ca59
|
[bug]=====奖池预览修改,图鉴详情添加点击反馈
|
2022-01-18 10:45:39 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
2e0bd1ded7
|
[飞升]=======显示修改
|
2022-01-18 09:47:38 +08:00 |
wangzhenxing
|
1de7293630
|
[飞升]======卡牌飞升预设修改
|
2022-01-17 16:53:26 +08:00 |
gaoxin
|
b7055edd5e
|
【图鉴】神将信息屏幕适配修改
|
2022-01-17 16:08:52 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +08:00 |
wangzhenxing
|
f257bc2c6d
|
[图鉴]=====图鉴神魂按钮显示修改
|
2022-01-17 14:26:17 +08:00 |
ZhangBiao
|
e3196e3ca2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:16:30 +08:00 |
ZhangBiao
|
409836ffb5
|
【名望礼包】提交
|
2022-01-17 13:16:18 +08:00 |
wangzhenxing
|
6be87dec74
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 11:00:42 +08:00 |
wangzhenxing
|
51d1f9e5a7
|
【图鉴】======图鉴列表界面预设修改
|
2022-01-17 10:58:36 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
wangzhenxing
|
082afa8466
|
【飞升】=====角色主界面修改
|
2022-01-17 10:47:15 +08:00 |
wangzhenxing
|
21e77fe60b
|
[图鉴]=======图鉴详情预设修改
|
2022-01-17 10:45:42 +08:00 |
ZhangBiao
|
e93b2816b4
|
【摘星阁】装备摘星阁属性拆分
|
2022-01-17 10:24:27 +08:00 |
wangzhenxing
|
9357e70d42
|
[角色信息]======名字位置修改
|
2022-01-15 18:44:08 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
e67ea3ae70
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 17:34:26 +08:00 |
ZhangBiao
|
b96aa3851c
|
【好感度】提交
|
2022-01-15 17:34:18 +08:00 |
wangzhenxing
|
1d170dfd2d
|
[图鉴]==========图鉴详情修改提交
|
2022-01-15 17:12:40 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +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
|
b0611db595
|
神将技能修改提交
|
2022-01-14 18:48:23 +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
|
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
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |