luyao
|
3565338eb8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-14 18:25:34 +08:00 |
luyao
|
d9c3b4cefe
|
超值基金图片修改提交
|
2021-07-14 18:25:26 +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 |
jiaoyangna
|
5f3e305613
|
描述修改提交
|
2021-07-14 17:18:13 +08:00 |
jiaoyangna
|
18e4652994
|
【ID1009791】 幸运探宝够12张券时开启红点提示
|
2021-07-14 17:05:50 +08:00 |
jiaoyangna
|
c3d42bc536
|
超值基金图片修改
(cherry picked from commit 771c79feff )
|
2021-07-14 17:00:30 +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
|
6aea37d365
|
Revert "Revert "超值基金提交""
This reverts commit 23fa4e0ab1 .
|
2021-07-14 16:56:27 +08:00 |
jiaoyangna
|
771c79feff
|
超值基金图片修改
|
2021-07-14 16:14:26 +08:00 |
jiaoyangna
|
7cca06a5d7
|
超值基金
|
2021-07-14 16:09:55 +08:00 |
zhangqiang
|
e4469de1c3
|
【游心】场景提交
|
2021-07-14 16:01:05 +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
|
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 |