jiaoyangna
|
bb9b58d489
|
Merge branch '0功能/神将来源' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-06-30 19:57:49 +08:00 |
jiaoyangna
|
bfd653a98f
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:48:05 +08:00 |
jiaoyangna
|
349404d50e
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:28:43 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
zhangqiang
|
dbe2b1f3ea
|
【心魔试炼】资源替换2
|
2021-06-30 16:29:37 +08:00 |
jiaoyangna
|
36cb3db3af
|
底图修改提交
|
2021-06-30 16:17:50 +08:00 |
zhangqiang
|
bd27e2094b
|
【心魔试炼】资源替换
|
2021-06-30 16:03:40 +08:00 |
ZhangBiao
|
3675ec9699
|
【心愿抽卡】取消按钮入场动画
|
2021-06-30 14:41:02 +08:00 |
ZhangBiao
|
00ad684deb
|
【心愿抽卡】QA
|
2021-06-30 13:51:47 +08:00 |
jiaoyangna
|
de642a3572
|
去掉点击事件
|
2021-06-30 10:48:50 +08:00 |
jiaoyangna
|
f834e2e17d
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-30 10:12:44 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
ZhangBiao
|
262b52c4aa
|
【心愿抽卡】代码基本完成
|
2021-06-29 18:10:15 +08:00 |
ZhangBiao
|
cc16057438
|
【心愿抽卡】接协议
|
2021-06-29 15:25:05 +08:00 |
ZhangBiao
|
69581dcaa1
|
【心愿抽卡】开坑
|
2021-06-29 11:30:26 +08:00 |
jiaoyangna
|
3c41e96caa
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05)
|
2021-06-28 18:36:01 +08:00 |
ZhangBiao
|
65887aa135
|
【站内信】提交
|
2021-06-28 10:44:15 +08:00 |
gaoxin
|
fbf43c9a3c
|
【适配】修复适配后图鉴界面不显示内容
|
2021-06-26 17:15:57 +08:00 |
wangzhenxing
|
fda66630b9
|
[适配]==== 战中boss界面,图鉴主界面修改提交
|
2021-06-26 17:11:10 +08:00 |
gaoxin
|
23293e2ddc
|
【适配】图鉴角色信息界面适配优化
|
2021-06-26 17:07:36 +08:00 |
jiaoyangna
|
83f549cc6d
|
首充滑动修改
|
2021-06-26 15:16:08 +08:00 |
jiaoyangna
|
7542d5e607
|
首充修改提交
|
2021-06-26 15:15:27 +08:00 |
jiaoyangna
|
de4bcd80b5
|
ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动
(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
|
2021-06-26 15:15:19 +08:00 |
ZhangBiao
|
4e2463723a
|
【灵兽】特效添加
|
2021-06-26 14:50:52 +08:00 |
zhangqiang
|
6f7d6731a4
|
【特效】主城/挂机界面自己小人脚底添加光圈4
|
2021-06-25 11:52:54 +08:00 |
zhangqiang
|
c7f8a84c99
|
【特效】主城/挂机界面自己小人脚底添加光圈
|
2021-06-24 16:15:39 +08:00 |
ZhangBiao
|
097cf4055f
|
【灵兽界面优化】优化界面效果
|
2021-06-24 14:47:54 +08:00 |
ZhangBiao
|
18d4289e39
|
【锻器阁】合成装备超框
|
2021-06-24 14:11:51 +08:00 |
zhangqiang
|
8cdb8123e3
|
【美术 -特权优化】快捷任务底框换一个更明显的,突出文字
|
2021-06-23 18:08:54 +08:00 |
jiaoyangna
|
cb37edbba0
|
秘宝间隔调整
|
2021-06-21 18:26:31 +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
|
0f309447c2
|
【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
|
2021-06-21 10:53:24 +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
|
c2f6c54063
|
【ID1016741】
【界面UI】全面屏手机界面适配异常
|
2021-06-21 10:22:21 +08:00 |
jiaoyangna
|
f4fe155533
|
大圣修改
|
2021-06-19 17:47:35 +08:00 |
jiaoyangna
|
67e5cbf8c9
|
大圣 不能查看详情修改
|
2021-06-19 15:29:31 +08:00 |
jiaoyangna
|
bf1e1f69e6
|
添加以领取标志
|
2021-06-18 19:13:51 +08:00 |
jiaoyangna
|
e267c0096b
|
预设提交
|
2021-06-18 18:56:46 +08:00 |
jiaoyangna
|
45a1079d88
|
大圣提交
|
2021-06-18 18:55:04 +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 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
ZhangBiao
|
ddfe59a1d0
|
【升星有礼】
|
2021-06-18 18:17:36 +08:00 |
ZhangBiao
|
a05df3c77e
|
【升星有理】
|
2021-06-18 18:10:58 +08:00 |
ZhangBiao
|
a60e8a4329
|
【惊喜礼盒】底部回弹位置低
|
2021-06-18 15:06:53 +08:00 |
jiaoyangna
|
09095e5b16
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
|
2021-06-18 11:08:40 +08:00 |