jiaoyangna
|
274f315d2b
|
大圣购买修改
|
2021-06-22 10:08:42 +08:00 |
jiaoyangna
|
cb37edbba0
|
秘宝间隔调整
|
2021-06-21 18:26:31 +08:00 |
ZhangBiao
|
252aff3423
|
【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示
|
2021-06-21 17:37:34 +08:00 |
ZhangBiao
|
0dc5976dd0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-21 16:57:31 +08:00 |
ZhangBiao
|
fe16795d8c
|
【主城】右上伸缩条闪烁修改
|
2021-06-21 16:57:22 +08:00 |
gaoxin
|
e888e3987e
|
【资源】草花背景资源还原
|
2021-06-21 16:32:03 +08:00 |
wangzhenxing
|
d943d3044b
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-06-21 15:29:16 +08:00 |
gaoxin
|
3f320f1e89
|
【降妖夺宝】修复协程导致报错
|
2021-06-21 14:12:33 +08:00 |
zhangqiang
|
057e32fe52
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 13:52:41 +08:00 |
ZhangBiao
|
ba5bc832d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 11:45:13 +08:00 |
ZhangBiao
|
4fdbc4a559
|
【降妖夺宝】抽卡跳转修改
|
2021-06-21 11:45:03 +08:00 |
jiaoyangna
|
77dea82a94
|
【ID1016745】
【升级豪礼】新到的图片资源,需要替换
|
2021-06-21 11:42:19 +08:00 |
jiaoyangna
|
0014224024
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:30:50 +08:00 |
jiaoyangna
|
daba103fdb
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 11:06:23 +08:00 |
jiaoyangna
|
be75375dd6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:53:42 +08:00 |
jiaoyangna
|
0f309447c2
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:53:24 +08:00 |
ZhangBiao
|
cf38744969
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:52:04 +08:00 |
ZhangBiao
|
428df0c41d
|
【降妖夺宝】限时商市道具光效穿透
|
2021-06-21 10:51:55 +08:00 |
zhangqiang
|
8152d96e1e
|
【福星高照】领取完所有奖励后,按钮红点不消失
|
2021-06-21 10:42:27 +08:00 |
jiaoyangna
|
e5ff298534
|
Revert "【ID1016740】"
This reverts commit 343b92aff9 .
|
2021-06-21 10:38:09 +08:00 |
jiaoyangna
|
343b92aff9
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:36:33 +08:00 |
jiaoyangna
|
3feebf1ef6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 10:22:25 +08:00 |
jiaoyangna
|
c2f6c54063
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 10:22:21 +08:00 |
ZhangBiao
|
65794931b3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-21 09:51:52 +08:00 |
ZhangBiao
|
8c0980e750
|
【降妖夺宝】十连上方资源显示修改
|
2021-06-21 09:51:44 +08:00 |
jiaoyangna
|
46efd9b960
|
关闭帮助界面
|
2021-06-19 17:50:23 +08:00 |
jiaoyangna
|
f4fe155533
|
大圣修改
|
2021-06-19 17:47:35 +08:00 |
jiaoyangna
|
b85b94fa68
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 17:07:20 +08:00 |
jiaoyangna
|
15361c2ef5
|
大圣跳转
|
2021-06-19 17:07:17 +08:00 |
wangzhenxing
|
5184ced8c8
|
[战斗]==============免疫buff清除提示修改
|
2021-06-19 16:41:00 +08:00 |
jiaoyangna
|
8342399870
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:50:56 +08:00 |
jiaoyangna
|
46621252d9
|
惊喜礼包拍脸修改
|
2021-06-19 15:50:39 +08:00 |
gaoxin
|
d11833e088
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:46:05 +08:00 |
gaoxin
|
04c89ccaa9
|
【月卡】月卡激活提示修改到关闭奖励界面之后
|
2021-06-19 15:45:13 +08:00 |
jiaoyangna
|
b6b55590b3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:29:41 +08:00 |
jiaoyangna
|
67e5cbf8c9
|
大圣 不能查看详情修改
|
2021-06-19 15:29:31 +08:00 |
gaoxin
|
6d4d1fc49b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:28:27 +08:00 |
gaoxin
|
b423005b6e
|
【活动】页签使用原图大小
|
2021-06-19 15:28:22 +08:00 |
jiaoyangna
|
2e693575a6
|
抽卡提示只在神将抽里出现
|
2021-06-19 15:00:37 +08:00 |
jiaoyangna
|
bf1e1f69e6
|
添加以领取标志
|
2021-06-18 19:13:51 +08:00 |
jiaoyangna
|
89facf0425
|
添加红点检测
|
2021-06-18 19:04:44 +08:00 |
jiaoyangna
|
883fdceb78
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-18 19:00:51 +08:00 |
jiaoyangna
|
e267c0096b
|
预设提交
|
2021-06-18 18:56:46 +08:00 |
jiaoyangna
|
45a1079d88
|
大圣提交
|
2021-06-18 18:55:04 +08:00 |
ZhangBiao
|
9e5819433e
|
【新将来袭】
|
2021-06-18 18:45:56 +08:00 |
ZhangBiao
|
a957834228
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:38:29 +08:00 |
ZhangBiao
|
70a90b0148
|
【新将来袭】在线刷新修改
|
2021-06-18 18:38:17 +08:00 |
gaoxin
|
e0a3b3837c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:31:26 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
gaoxin
|
f85dc798d3
|
【公告】公告id添加对不同渠道的处理
|
2021-06-18 18:25:51 +08:00 |