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
|
f90babe2e8
|
Revert "Revert "【山河试炼】界面提交""
This reverts commit 3dc9dd5d64 .
|
2021-07-14 11:30:35 +08:00 |
ZhangBiao
|
6be1886d2f
|
【山河试炼】开坑
|
2021-07-14 11:30:09 +08:00 |
ZhangBiao
|
90b159045d
|
Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua
|
2021-07-14 11:27:57 +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
|
d94dd117e4
|
【场景】添加国内正式服打包场景
|
2021-07-13 18:28:00 +08:00 |
JLIOSM1
|
5b311e2ac8
|
【http】请求加密
|
2021-07-13 18:24:33 +08:00 |
JLIOSM1
|
1ba37dce92
|
【IOS】修改翻译文件
|
2021-07-13 18:20:56 +08:00 |
JLIOSM1
|
b2f88a0d29
|
【ios】修改宏定义,修复resconfig加载失败
|
2021-07-13 18:20:03 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
jiaoyangna
|
23fa4e0ab1
|
Revert "超值基金提交"
This reverts commit 75ffbf8d0b .
|
2021-07-13 14:39:31 +08:00 |
JieLing
|
d809c9820d
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
|
2021-07-13 14:18:44 +08:00 |
gaoxin
|
fa1e3e15e0
|
【角色升级】修复高星级无法升级的问题
|
2021-07-13 14:02:47 +08:00 |
gaoxin
|
e85939abc7
|
【角色升级】修复高星级无法升级的问题
|
2021-07-13 11:19:01 +08:00 |
jiaoyangna
|
4ff85486ed
|
【ID1009791】
幸运探宝够12张券时开启红点提示
(cherry picked from commit 877ec25063 )
|
2021-07-13 10:39:30 +08:00 |
jiaoyangna
|
9540951a28
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-13 10:38:39 +08:00 |
jiaoyangna
|
877ec25063
|
【ID1009791】
幸运探宝够12张券时开启红点提示
|
2021-07-13 10:35:39 +08:00 |
jiaoyangna
|
e444a1283c
|
【ID1009791】
幸运探宝够12张券时开启红点提示
|
2021-07-13 10:35:03 +08:00 |
JieLing
|
1fcde77049
|
Merge branch 'china/dev' into china/test
|
2021-07-12 22:32:05 +08:00 |
gaoxin
|
3d3797345d
|
【角色升级】添加非正常升级校验
|
2021-07-12 20:11:15 +08:00 |
JLIOSM1
|
683a13bf2a
|
【IOS】修改iOS包的AB包目录结构
|
2021-07-12 18:31:52 +08:00 |
jiaoyangna
|
ff8d774c2f
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-12 18:06:06 +08:00 |
gaoxin
|
facb0fdf4a
|
【角色升级】删除升级校验
|
2021-07-12 17:29:39 +08:00 |
jiaoyangna
|
db2f2312a7
|
超值基金提交
|
2021-07-12 17:29:14 +08:00 |
jiaoyangna
|
75ffbf8d0b
|
超值基金提交
|
2021-07-12 17:28:24 +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 |
JieLing
|
2606314be5
|
Merge branch 'china/dev' into china/test
|
2021-07-12 10:36:28 +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 |
JieLing
|
437fa8c930
|
Merge branch 'china/dev' into china/test
|
2021-07-10 20:33:32 +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 |