wangzhenxing
|
59b36cbf94
|
[战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性
|
2021-07-16 18:36:52 +08:00 |
jiaoyangna
|
05358f15f5
|
玲珑宝镜修改提交
|
2021-07-16 17:52:33 +08:00 |
jiaoyangna
|
4f0f69b17e
|
玲珑报警
|
2021-07-16 17:41:56 +08:00 |
jiaoyangna
|
c1a7cba724
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 17:41:41 +08:00 |
jiaoyangna
|
a2fa26e67e
|
玲珑宝镜修改提交
|
2021-07-16 17:41:38 +08:00 |
ZhangBiao
|
309486e443
|
【点将台】报错修改提交
|
2021-07-16 16:54:17 +08:00 |
jiaoyangna
|
ef35e0bca0
|
玲珑宝镜帮助修改提交
|
2021-07-16 16:24:56 +08:00 |
jiaoyangna
|
360a8d3cae
|
主题活动限时召唤,乾坤宝盒卡死提交
|
2021-07-16 16:23:35 +08:00 |
wangzhenxing
|
a70f45e7a5
|
[乾坤宝盒]==========提示文字颜色修改
|
2021-07-16 16:19:59 +08:00 |
gaoxin
|
2cc76fd123
|
Merge branch 'china/ios' into china/dev
|
2021-07-16 15:57:29 +08:00 |
jiaoyangna
|
2d6f5f3fb1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 15:51:12 +08:00 |
jiaoyangna
|
bec2eca580
|
适配修改
|
2021-07-16 15:51:06 +08:00 |
JLIOSM1
|
56e7492a91
|
【商店】修复妖精商店资源回收导致白片
|
2021-07-16 15:37:48 +08:00 |
wangzhenxing
|
d6226e77bf
|
[乾坤宝盒]=====魂印详情修改提交
|
2021-07-16 15:11:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
324ba7bc57
|
文字内容修改提交
|
2021-07-16 15:04:09 +08:00 |
gaoxin
|
1361261bd6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 14:49:53 +08:00 |
gaoxin
|
e34f6a79cb
|
【log】关闭鸿蒙阵推送log
|
2021-07-16 14:49:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
6aeea9a736
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 14:46:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
aae52de39b
|
去掉已获得屏蔽
|
2021-07-16 14:46:21 +08:00 |
gaoxin
|
912945a782
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 14:42:22 +08:00 |
gaoxin
|
27bfa3979a
|
【登录】登录页加载Stream目录中的视频
|
2021-07-16 14:42:16 +08:00 |
wangzhenxing
|
3c5a51a10c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 14:21:07 +08:00 |
wangzhenxing
|
65a6edeba5
|
[乾坤宝盒]======改成只能选择3个
|
2021-07-16 14:20:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
0aa779f177
|
添加左右切换按钮
|
2021-07-16 14:18:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
4d11ade910
|
四元阵修改
|
2021-07-16 14:09:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
328a382d4c
|
奖池预览页签修改提交
|
2021-07-16 11:55:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
0a4ef7e68d
|
心愿抽卡修改提交
|
2021-07-16 11:40:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
60132143c7
|
新手引导修改提交
|
2021-07-16 11:19:36 +08:00 |
DESKTOP-98AVA47\Administrator
|
04c9ab3b6b
|
抽卡修改提交
|
2021-07-16 10:30:56 +08:00 |
DESKTOP-98AVA47\Administrator
|
59de7adf87
|
去掉宝箱bilingbiling
|
2021-07-16 10:26:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
c688666e99
|
向左滑动修改提交
|
2021-07-16 10:18:57 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7187d75c4
|
预设调整,左右红点切换界面调整
|
2021-07-16 10:12:41 +08:00 |
JLIOSM1
|
808efb6764
|
【延长登录界面的打开事件】
|
2021-07-15 23:08:41 +08:00 |
JLIOSM1
|
d2dd9401f4
|
【登录】提审服不再显示公告
|
2021-07-15 23:04:59 +08:00 |
JLIOSM1
|
3ca8ee5259
|
【引导】修复新手引导跳转界面导致界面无法销毁的问题
|
2021-07-15 23:04:07 +08:00 |
DESKTOP-98AVA47\Administrator
|
af7e58f531
|
位置修改
|
2021-07-15 21:02:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
08b9873d25
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 20:48:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
53dadfff49
|
抽卡修改提交
|
2021-07-15 20:48:46 +08:00 |
wangzhenxing
|
908f15bf49
|
[乾坤宝盒]===========预设特效修改提交
|
2021-07-15 20:17:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
fc1a2bca84
|
文字颜色修改提交
|
2021-07-15 19:53:08 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
ZhangBiao
|
88bd6a9801
|
【新副本】完成?
|
2021-07-15 19:46:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
3ee8153112
|
抽卡界面修改
|
2021-07-15 19:40:09 +08:00 |
DESKTOP-98AVA47\Administrator
|
6d4bf07c21
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:38:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
01a2171a31
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:33:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
18cc7ec6a4
|
红点报错修改提交
|
2021-07-15 19:20:20 +08:00 |
DESKTOP-98AVA47\Administrator
|
695a61abaa
|
Merge branch '0优化/主题活动' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-07-15 18:52:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
c5ceba8603
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 18:51:51 +08:00 |
wangzhenxing
|
4d428fd383
|
[战斗]==========被动292 ,319 修改
|
2021-07-15 18:20:38 +08:00 |
wangzhenxing
|
e2f4a55226
|
【乾坤宝盒】=============协议提交
|
2021-07-15 17:19:41 +08:00 |
wangzhenxing
|
fe8714f7fa
|
[乾坤宝盒]========优化提交
|
2021-07-15 16:43:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
27b0f524f9
|
协议提交
|
2021-07-15 16:40:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
55607708df
|
资源修改提交
|
2021-07-15 16:19:27 +08:00 |
ZhangBiao
|
109a109301
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/StreamingAssets/Android.meta
|
2021-07-15 16:19:05 +08:00 |
ZhangBiao
|
7d4c8b6c3f
|
【山河试炼】
|
2021-07-15 16:08:39 +08:00 |
ZhangBiao
|
7075049c45
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 15:58:58 +08:00 |
ZhangBiao
|
4c5a8b73ef
|
【山河试炼】奖励顺序错乱修改
|
2021-07-15 15:58:49 +08:00 |
DESKTOP-98AVA47\Administrator
|
25ffe0ff1f
|
玲珑宝镜特效提交
|
2021-07-15 15:58:01 +08:00 |
ZhangBiao
|
dd8f907259
|
【副本界面】提交
|
2021-07-15 15:54:18 +08:00 |
ZhangBiao
|
e3baabda96
|
【副本界面】特效提交
|
2021-07-15 15:25:25 +08:00 |
wangzhenxing
|
5985853669
|
[乾坤宝盒]========功能修改
|
2021-07-15 15:12:40 +08:00 |
wangzhenxing
|
fcaa098564
|
[乾坤宝盒]===========功能修改
|
2021-07-15 14:57:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
25939d4d25
|
玲珑宝镜特效上传
|
2021-07-15 14:44:19 +08:00 |
DESKTOP-98AVA47\Administrator
|
36f04065fc
|
Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-15 12:59:20 +08:00 |
wangzhenxing
|
c3da0a2df8
|
[乾坤宝盒]=============优化提交
|
2021-07-15 11:14:32 +08:00 |
zhangqiang
|
d9ca231e57
|
【跨服天梯】国内提交+1
|
2021-07-14 22:17:16 +08:00 |
zhangqiang
|
c3a456af52
|
【跨服天梯】国内提交+1
|
2021-07-14 22:12:40 +08:00 |
zhangqiang
|
6a3c48e0b8
|
【跨服天梯】国内提交+1
|
2021-07-14 21:43:03 +08:00 |
zhangqiang
|
3b9af50a15
|
【跨服天梯】国内提交+1
|
2021-07-14 20:52:54 +08:00 |
zhangqiang
|
b034028ad1
|
【跨服天梯】国内提交+1
|
2021-07-14 20:47:49 +08:00 |
zhangqiang
|
98362ef902
|
【跨服天梯】国内提交+1
|
2021-07-14 20:27:04 +08:00 |
ZhangBiao
|
491a48fe95
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-14 20:00:54 +08:00 |
ZhangBiao
|
3d7baa815e
|
【山河试炼】红点报错修改
|
2021-07-14 20:00:44 +08:00 |
zhangqiang
|
1f8d19f3d8
|
【跨服天梯】国内提交+1 目标被其他玩家击败后,点击挑战仍有问题
|
2021-07-14 19:07:05 +08:00 |
wangzhenxing
|
e0d680da50
|
[乾坤宝盒]=============功能提交
|
2021-07-14 18:20:04 +08:00 |
ZhangBiao
|
bc55cf3a19
|
Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-14 18:08:46 +08:00 |
wangzhenxing
|
ca95dcb71e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-14 18:05:56 +08:00 |
wangzhenxing
|
070fabb0a6
|
[乾坤宝盒]=========添加常量
|
2021-07-14 18:05:37 +08:00 |
zhangqiang
|
18d24b638f
|
【跨服天梯】国内提交+1
|
2021-07-14 17:41:26 +08:00 |
jiaoyangna
|
5f3e305613
|
描述修改提交
|
2021-07-14 17:18:13 +08:00 |
jiaoyangna
|
18e4652994
|
【ID1009791】 幸运探宝够12张券时开启红点提示
|
2021-07-14 17:05:50 +08:00 |
jiaoyangna
|
7d5968f058
|
超值基金
(cherry picked from commit 7cca06a5d7)
|
2021-07-14 17:00:22 +08:00 |
jiaoyangna
|
dc363d25c4
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 9e1366ff27)
|
2021-07-14 17:00:14 +08:00 |
jiaoyangna
|
977faf9b04
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit ff14ff62ee)
|
2021-07-14 17:00:07 +08:00 |
jiaoyangna
|
a8fd256812
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 53e0f1adcc)
|
2021-07-14 16:59:59 +08:00 |
jiaoyangna
|
047c5c26f7
|
globaldefine冲突修改
|
2021-07-14 16:59:03 +08:00 |
jiaoyangna
|
f1a7e93595
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit ff8d774c2f)
|
2021-07-14 16:57:15 +08:00 |
jiaoyangna
|
7cca06a5d7
|
超值基金
|
2021-07-14 16:09:55 +08:00 |
zhangqiang
|
008df5b422
|
【跨服天梯】国内提交+1
|
2021-07-14 15:48:34 +08:00 |
zhangqiang
|
eec50395f0
|
【跨服天梯】国内提交+1
|
2021-07-14 15:08:54 +08:00 |
jiaoyangna
|
9e1366ff27
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 15:05:04 +08:00 |
ZhangBiao
|
0497fc30f5
|
【山河试炼】按钮状态颜色修改
|
2021-07-14 14:10:06 +08:00 |
jiaoyangna
|
ff14ff62ee
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 14:07:44 +08:00 |
ZhangBiao
|
3a3bcf21b8
|
【山河试炼】提交
|
2021-07-14 13:48:29 +08:00 |
jiaoyangna
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
6d56325c26
|
【山河试炼】按钮判断方式提交
|
2021-07-14 11:41:14 +08:00 |
ZhangBiao
|
55f71e2c89
|
Revert "Revert "【山河试炼】增加主城红点检测""
This reverts commit 67e44741f6.
|
2021-07-14 11:36:55 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
ZhangBiao
|
227def7404
|
【山河试炼】代码提交
|
2021-07-14 11:33:33 +08:00 |
ZhangBiao
|
6be1886d2f
|
【山河试炼】开坑
|
2021-07-14 11:30:09 +08:00 |
zhangqiang
|
2c9d4f5c51
|
【跨服天梯】国内提交+1
|
2021-07-13 19:48:14 +08:00 |
JLIOSM1
|
11f72d4e73
|
【http】接口添加失败回调事件
|
2021-07-13 18:56:21 +08:00 |
JLIOSM1
|
63dc0dc0c2
|
合并zf_test到iOS
|
2021-07-13 18:55:21 +08:00 |
JLIOSM1
|
5b311e2ac8
|
【http】请求加密
|
2021-07-13 18:24:33 +08:00 |
zhangqiang
|
f7932b9e8c
|
【罗浮争锋】国内提交+1
|
2021-07-13 17:40:25 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
gaoxin
|
fa1e3e15e0
|
【角色升级】修复高星级无法升级的问题
|
2021-07-13 14:02:47 +08:00 |
zhangqiang
|
5162b3247c
|
【跨服天梯】国内提交+1
|
2021-07-13 11:28:36 +08:00 |
gaoxin
|
e85939abc7
|
【角色升级】修复高星级无法升级的问题
|
2021-07-13 11:19:01 +08:00 |
jiaoyangna
|
e444a1283c
|
【ID1009791】
幸运探宝够12张券时开启红点提示
|
2021-07-13 10:35:03 +08:00 |
gaoxin
|
3d3797345d
|
【角色升级】添加非正常升级校验
|
2021-07-12 20:11:15 +08:00 |
jiaoyangna
|
ff8d774c2f
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-12 18:06:06 +08:00 |
gaoxin
|
facb0fdf4a
|
【角色升级】删除升级校验
|
2021-07-12 17:29:39 +08:00 |
zhangqiang
|
90b577bc16
|
【心魔试炼】
|
2021-07-12 16:35:54 +08:00 |
gaoxin
|
58b2c30ea9
|
【角色升级】修复升级错误的问题
|
2021-07-12 15:59:14 +08:00 |
jiaoyangna
|
763c45ebd0
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
(cherry picked from commit 7371405fbd)
|
2021-07-12 11:16:54 +08:00 |
jiaoyangna
|
7371405fbd
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
|
2021-07-12 11:13:12 +08:00 |
gaoxin
|
39b9488286
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-12 10:33:16 +08:00 |
gaoxin
|
febee39f82
|
【英雄升级】英雄长按升级时不再进行切换操作
|
2021-07-12 10:33:05 +08:00 |
gaoxin
|
6ab4fd2495
|
【关闭多点触控】
|
2021-07-12 10:28:57 +08:00 |
jiaoyangna
|
a233fb2c7d
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
(cherry picked from commit 4d588e2948)
|
2021-07-12 10:19:54 +08:00 |
jiaoyangna
|
4d588e2948
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
|
2021-07-12 10:19:13 +08:00 |
jiaoyangna
|
5450b9201a
|
心愿添加问号确认按钮
|
2021-07-10 18:50:39 +08:00 |
jiaoyangna
|
b97b5da01d
|
抽卡红点提交
|
2021-07-10 18:27:28 +08:00 |
jiaoyangna
|
f710e20c60
|
抽卡红点提交
|
2021-07-10 18:12:50 +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
|
1ead3c126d
|
抽卡红点提交
|
2021-07-10 14:56:28 +08:00 |
jiaoyangna
|
b03751a132
|
无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a)
|
2021-07-10 14:02:18 +08:00 |
jiaoyangna
|
bbf89bbd3a
|
无尽副本九元露修改提交
|
2021-07-10 14:00:03 +08:00 |
jiaoyangna
|
4531a9636a
|
神将界面层级修改提交
(cherry picked from commit 1e18e57b12)
|
2021-07-09 18:41:11 +08:00 |
jiaoyangna
|
1e18e57b12
|
神将界面层级修改提交
|
2021-07-09 18:40:52 +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 |
jiaoyangna
|
7c960704aa
|
【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置
|
2021-07-09 18:01:41 +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 |
gaoxin
|
6405a0ad4d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 17:06:01 +08:00 |
gaoxin
|
1f4499e8bb
|
【物品特效】修复魂印特效显示错误
|
2021-07-09 17:05:55 +08:00 |
jiaoyangna
|
2686f970d7
|
无尽副本修改提交
|
2021-07-09 17:04:25 +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 |
jiaoyangna
|
dd1f598515
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-09 15:22:10 +08:00 |
gaoxin
|
1a33172a27
|
【地图】节点27是特效节点
|
2021-07-09 15:02:11 +08:00 |
gaoxin
|
c33b24ba18
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-09 14:57:02 +08:00 |
gaoxin
|
be7cc055a1
|
【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示
|
2021-07-09 14:56:57 +08:00 |
jiaoyangna
|
21b85bedff
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
(cherry picked from commit eae0af74e5)
|
2021-07-09 14:47:17 +08:00 |
jiaoyangna
|
eae0af74e5
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移 调整间距
|
2021-07-09 14:45:11 +08:00 |
gaoxin
|
5d60ef45ab
|
【地图】添加第27号事件点
|
2021-07-09 14:37:40 +08:00 |
jiaoyangna
|
92c22544e0
|
修改抽卡界面描述
|
2021-07-09 14:08:17 +08:00 |
jiaoyangna
|
55b4379c47
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-09 12:01:28 +08:00 |
wangzhenxing
|
33b37451e1
|
【战斗】=============被动 108 200 283 322 修改 新增被动 337
|
2021-07-09 11:54:02 +08:00 |
ZhangBiao
|
5e1897515b
|
【商店】商店黑屏修复
|
2021-07-09 11:10:38 +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
|
30ab410f00
|
抽卡优化
|
2021-07-08 18:40:43 +08:00 |
jiaoyangna
|
fa30243bf5
|
玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
|
2021-07-08 18:30:29 +08:00 |
jiaoyangna
|
6ea9ee51c0
|
玉皇大帝修改提交
|
2021-07-08 18:29:28 +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 |
ZhangBiao
|
30f2a8cb1a
|
【鸿蒙阵】增加logerror
|
2021-07-08 15:51:10 +08:00 |
zhangqiang
|
7c7e0970a2
|
【跨服天梯】国内提交替换资源 。。。。
|
2021-07-08 10:36:33 +08:00 |
ZhangBiao
|
3764ac753b
|
【新副本】界面时间显示调整
|
2021-07-08 10:15:39 +08:00 |
wangzhenxing
|
f247221fcc
|
【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能)
|
2021-07-07 20:29:37 +08:00 |
ZhangBiao
|
f44a8c280f
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-07 18:42:13 +08:00 |
ZhangBiao
|
6950b52db9
|
【新副本】基本完成
|
2021-07-07 17:05:32 +08:00 |
zhangqiang
|
9c2dee5856
|
【缥缈之旅】没解锁天数完成了任务,礼包显示灰点
|
2021-07-07 15:56:29 +08:00 |
wangzhenxing
|
dad8dbf11b
|
[公会红包]=============红包抢完显示白片修改
|
2021-07-07 15:09:06 +08:00 |
ZhangBiao
|
656c6a00d2
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-07 14:44:00 +08:00 |
ZhangBiao
|
3732c7c4ca
|
【新副本】界面提交
|
2021-07-07 14:43:37 +08:00 |
ZhangBiao
|
a711f13642
|
【新副本】资源重新提交
|
2021-07-07 13:50:11 +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 |
ZhangBiao
|
6a3c7903f5
|
【新副本】资源提交
|
2021-07-06 18:32:23 +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 |
ZhangBiao
|
6dd996b752
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-06 16:31:24 +08:00 |
ZhangBiao
|
e64223b78b
|
【副本】新界面提交
|
2021-07-06 16:30:58 +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 |
JieLing
|
8df851509f
|
Merge branch 'china/dev' into china/test
|
2021-07-06 15:06:15 +08:00 |