Commit Graph

7721 Commits (7075049c452c4f73d217e752f474d15e6e2633b0)
 

Author SHA1 Message Date
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
wangzhenxing 5985853669 [乾坤宝盒]========功能修改 2021-07-15 15:12:40 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
ZhangBiao 37dd3100b9 【心愿抽卡】文字内容颜色调整 2021-07-15 13:44:46 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
skuld 7845904c32 红点位置修改提交 2021-07-15 10:48:07 +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
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
zhangqiang e4469de1c3 【游心】场景提交 2021-07-14 16:01:05 +08:00
ZhangBiao 0497fc30f5 【山河试炼】按钮状态颜色修改 2021-07-14 14:10:06 +08:00
ZhangBiao 3a3bcf21b8 【山河试炼】提交 2021-07-14 13:48:29 +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
jiaoyangna 23fa4e0ab1 Revert "超值基金提交"
This reverts commit 75ffbf8d0b.
2021-07-13 14:39:31 +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
gaoxin 3d3797345d 【角色升级】添加非正常升级校验 2021-07-12 20:11:15 +08:00
gaoxin facb0fdf4a 【角色升级】删除升级校验 2021-07-12 17:29:39 +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
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
gaoxin 96475f3085 【角色升级】添加突破最大等级判断 2021-07-10 17:29:31 +08:00