DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |
jiaoyangna
|
acbdf46600
|
跳转 修改提交
|
2021-07-20 13:46:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
8168d284f0
|
跳转提交
|
2021-07-20 10:20:41 +08:00 |
DESKTOP-98AVA47\Administrator
|
2f9a357023
|
跳转修改提交
|
2021-07-19 21:58:45 +08:00 |
jiaoyangna
|
61a2da78cd
|
超值基金跳转
|
2021-07-19 11:48:41 +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 |
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 |
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
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
jiaoyangna
|
1ead3c126d
|
抽卡红点提交
|
2021-07-10 14:56:28 +08:00 |
jiaoyangna
|
13905916d1
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 16:48:59 +08:00 |
zhangqiang
|
fbda34d678
|
Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-07-03 16:53:42 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +08:00 |
ZhangBiao
|
70b42de2ac
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 20:09:56 +08:00 |
jiaoyangna
|
4f34d6ed42
|
神将来源返回时打开
|
2021-07-01 18:12:20 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
zhangqiang
|
deb6eeca03
|
【跳转】增加惊喜礼盒跳转
|
2021-07-01 15:01:57 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
jiaoyangna
|
1c89a4218c
|
假人骑牛修改
|
2021-06-23 11:05:53 +08:00 |
jiaoyangna
|
e5a491b7b9
|
随机人物修改提交
|
2021-06-23 10:20:03 +08:00 |
jiaoyangna
|
15361c2ef5
|
大圣跳转
|
2021-06-19 17:07:17 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
gaoxin
|
a4fa7cacff
|
Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f .
|
2021-06-16 10:08:41 +08:00 |
ZhangBiao
|
160a3e1a6f
|
【山河试炼】差红点的检测
|
2021-06-15 20:33:22 +08:00 |
jiaoyangna
|
ed4472a298
|
挂机卡死修改提交
|
2021-06-11 10:48:11 +08:00 |
jiaoyangna
|
2419089ff4
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:30:57 +08:00 |
jiaoyangna
|
11bb03fd2b
|
【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
|
2021-06-11 10:18:38 +08:00 |
zhangqiang
|
04fba6a182
|
【页签优化】游戏内分页签高度距离统一化
|
2021-06-09 12:32:30 +08:00 |
jiaoyangna
|
bf5c4197ce
|
【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
|
2021-06-09 11:03:18 +08:00 |
gaoxin
|
fe517d91ed
|
【红点】还原清空所有红点的操作
|
2021-06-04 23:56:09 +08:00 |
ZhangBiao
|
39180183a9
|
【任务头像】红点问题修改
|
2021-06-04 18:41:32 +08:00 |
gaoxin
|
4077e33390
|
【红点】箭头红点不消失修复
|
2021-06-03 19:30:57 +08:00 |
ZhangBiao
|
07a877bd4c
|
【牛气冲天】红点修改
|
2021-06-03 18:19:12 +08:00 |
ZhangBiao
|
d19325ce7b
|
【公会红点】报错修改
|
2021-06-03 17:59:14 +08:00 |
wangzhenxing
|
2cde942f47
|
[限时祈愿]=====红点逻辑修改
|
2021-06-03 12:04:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
1f75672cb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 18:15:45 +08:00 |
zhangqiang
|
f265cb07ef
|
【山河社稷图】红点帮错 公会技能属性名称修改
|
2021-06-02 17:39:11 +08:00 |
zhangqiang
|
fb8410eaa5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 19:48:05 +08:00 |
zhangqiang
|
859bd6679e
|
点将台10连加入红点提示
|
2021-06-01 19:47:54 +08:00 |
jiaoyangna
|
a1ac495ca2
|
红点提交
|
2021-06-01 17:22:23 +08:00 |
jiaoyangna
|
c4c0cb5a69
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 16:53:25 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
ZhangBiao
|
2a4927477c
|
【主题活动】跳转问题
|
2021-06-01 14:58:57 +08:00 |
ZhangBiao
|
9ebd4c5e05
|
【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面
|
2021-05-31 18:00:42 +08:00 |