gaoxin
|
febee39f82
|
【英雄升级】英雄长按升级时不再进行切换操作
|
2021-07-12 10:33:05 +08:00 |
gaoxin
|
96475f3085
|
【角色升级】添加突破最大等级判断
|
2021-07-10 17:29:31 +08:00 |
wangzhenxing
|
5dd8dded1d
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-07-10 15:27:50 +08:00 |
jiaoyangna
|
b03751a132
|
无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a )
|
2021-07-10 14:02:18 +08:00 |
jiaoyangna
|
4531a9636a
|
神将界面层级修改提交
(cherry picked from commit 1e18e57b12 )
|
2021-07-09 18:41:11 +08:00 |
gaoxin
|
224f0c8c82
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 18:28:24 +08:00 |
gaoxin
|
1d739a9d9d
|
【物品特效】魂印各界面显示修改
|
2021-07-09 18:28:18 +08:00 |
jiaoyangna
|
fe5fc7fa68
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置
(cherry picked from commit 7c960704aa )
|
2021-07-09 18:02:08 +08:00 |
gaoxin
|
f7e5775495
|
【登录】修改判断提审和正式服的方式
|
2021-07-09 17:33:21 +08:00 |
gaoxin
|
e3eff1e553
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 17:22:58 +08:00 |
gaoxin
|
5d51821dbe
|
【物品特效】修复魂印宝箱详细界面不显示特效的问题
|
2021-07-09 17:22:51 +08:00 |
jiaoyangna
|
36a4a6241f
|
无尽副本修改提交
(cherry picked from commit 2686f970d7 )
|
2021-07-09 17:11:29 +08:00 |
jiaoyangna
|
751f7cd84b
|
【ID1009609】
【优化】无尽副本优化
(cherry picked from commit dd1f598515 )
|
2021-07-09 17:11:23 +08:00 |
ZhangBiao
|
a00e8d0966
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 16:56:33 +08:00 |
ZhangBiao
|
958254f93d
|
【神将升级】升级加校验
|
2021-07-09 16:56:05 +08:00 |
gaoxin
|
1a33172a27
|
【地图】节点27是特效节点
|
2021-07-09 15:02:11 +08:00 |
jiaoyangna
|
21b85bedff
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
(cherry picked from commit eae0af74e5 )
|
2021-07-09 14:47:17 +08:00 |
gaoxin
|
5d60ef45ab
|
【地图】添加第27号事件点
|
2021-07-09 14:37:40 +08:00 |
wangzhenxing
|
33b37451e1
|
【战斗】=============被动 108 200 283 322 修改 新增被动 337
|
2021-07-09 11:54:02 +08:00 |
ZhangBiao
|
b02b315f78
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-08 18:41:26 +08:00 |
ZhangBiao
|
fc8e199a43
|
【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破
|
2021-07-08 18:41:14 +08:00 |
jiaoyangna
|
fa30243bf5
|
玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0 )
|
2021-07-08 18:30:29 +08:00 |
zhangqiang
|
21ec904da5
|
【心魔试炼】点击快速战斗偶先报错卡死
|
2021-07-08 18:08:16 +08:00 |
zhangqiang
|
c723fa04af
|
【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字
|
2021-07-08 16:20:22 +08:00 |
ZhangBiao
|
e250223aa2
|
【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a )
|
2021-07-08 15:55:04 +08:00 |
wangzhenxing
|
f247221fcc
|
【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能)
|
2021-07-07 20:29:37 +08:00 |
zhangqiang
|
9c2dee5856
|
【缥缈之旅】没解锁天数完成了任务,礼包显示灰点
|
2021-07-07 15:56:29 +08:00 |
wangzhenxing
|
dad8dbf11b
|
[公会红包]=============红包抢完显示白片修改
|
2021-07-07 15:09:06 +08:00 |
jiaoyangna
|
df4a9b0d74
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-07 11:57:49 +08:00 |
jiaoyangna
|
2042f3ace8
|
Merge branch '0优化/主题活动' into china/dev
|
2021-07-07 11:57:31 +08:00 |
jiaoyangna
|
c72ccc962b
|
【ID1009632】
【优化】修改无尽副本对话ui
|
2021-07-07 11:53:23 +08:00 |
jiaoyangna
|
8ec0256d78
|
排序修改提交
|
2021-07-07 11:44:40 +08:00 |
zhangqiang
|
5163eab963
|
【缥缈之旅】停在活动界面等待活动结束,没有自动退出,继续操作活动内的按钮,弹服务器紧急维护
|
2021-07-07 11:40:30 +08:00 |
jiaoyangna
|
fd9f4248b6
|
百宝商会文字错乱修改
|
2021-07-07 11:30:21 +08:00 |
jiaoyangna
|
7aa590621c
|
百宝商会文字错乱修改
|
2021-07-07 11:28:50 +08:00 |
jiaoyangna
|
05ef24c89c
|
【ID1009632】
【优化】修改无尽副本对话ui
|
2021-07-06 19:01:27 +08:00 |
jiaoyangna
|
735f694270
|
隐藏页签
|
2021-07-06 17:04:36 +08:00 |
zhangqiang
|
22e00b9fcd
|
【心魔试炼】增加快速挑战功能
|
2021-07-06 16:50:48 +08:00 |
jiaoyangna
|
13905916d1
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 16:48:59 +08:00 |
jiaoyangna
|
6cc47ddac1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-06 15:50:41 +08:00 |
jiaoyangna
|
bc185698d3
|
颜色修改提交
|
2021-07-06 15:50:32 +08:00 |
gaoxin
|
8297176603
|
Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
# Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
# Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-07-06 15:37:43 +08:00 |
gaoxin
|
441952c2fb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-06 15:27:44 +08:00 |
gaoxin
|
9c58070aa8
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
# Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
# Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
|
2021-07-06 15:27:09 +08:00 |
jiaoyangna
|
1cd1e719b4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-06 15:26:06 +08:00 |
jiaoyangna
|
337ad7b1d2
|
颜色修改提交
|
2021-07-06 15:26:02 +08:00 |
jiaoyangna
|
bc34bdce69
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 15:19:56 +08:00 |
zhangqiang
|
c66cd98958
|
【化虚坛】神将合成材料框没有隐藏bug
|
2021-07-06 14:53:15 +08:00 |
jiaoyangna
|
3219a1a2b8
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 14:43:45 +08:00 |
jiaoyangna
|
8dfb6ac056
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 11:41:01 +08:00 |