xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
wangzhenxing
|
ebfddaad60
|
法宝心愿修改提交
|
2023-06-06 15:57:53 +08:00 |
wangzhenxing
|
2bf115a8d8
|
挂机奖励预览修改
|
2022-12-06 11:07:34 +08:00 |
dengdan
|
b968848bc4
|
修改部分系统按钮样式
|
2022-12-01 15:35:21 +08:00 |
dengdan
|
dcff772716
|
修改部分系统的按钮样式
|
2022-11-30 21:51:06 +08:00 |
wangzhenxing
|
5113dfb137
|
元神抽卡添加10连
|
2022-11-10 10:22:17 +08:00 |
shihongyi
|
3df404296c
|
四元阵 10连
|
2022-11-12 03:51:53 +08:00 |
wangzhenxing
|
7c34cec6f3
|
[抽卡]=====宝箱名字修改
|
2022-06-09 13:57:12 +08:00 |
wangzhenxing
|
9eb6f8fb4e
|
[英雄信息]=====背景修改
|
2022-06-06 16:14:29 +08:00 |
wangzhenxing
|
6bc4adee78
|
[英雄信息界面]=====背景修改
|
2022-06-06 15:43:15 +08:00 |
wangzhenxing
|
504da04293
|
[英雄信息界面]=======底图修改
|
2022-06-06 10:52:55 +08:00 |
wangzhenxing
|
84f96972ce
|
预设修改提交
|
2022-04-26 11:51:51 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
jiaoyangna
|
209bd7ed0c
|
四元阵特效修改提交
(cherry picked from commit f355940615)
|
2021-08-31 10:54:32 +08:00 |
jiaoyangna
|
1adf97eddc
|
四元阵适配修改
|
2021-08-06 16:56:26 +08:00 |
jiaoyangna
|
ed3494e263
|
【ID1009947】
【优化】四元阵界面 新增界面特效
|
2021-08-05 15:09:58 +08:00 |
ZhangBiao
|
851059fe4d
|
【点将台】适配修改
|
2021-08-02 10:34:21 +08:00 |
jiaoyangna
|
9266d81377
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-30 14:30:10 +08:00 |
jiaoyangna
|
a7b8bb88fc
|
四元阵适配修改
|
2021-07-30 10:29:55 +08:00 |
jiaoyangna
|
89cf45bf35
|
四元阵适配修改
|
2021-07-30 10:25:29 +08:00 |
jiaoyangna
|
0480506f53
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-29 18:36:30 +08:00 |
jiaoyangna
|
7cf1150c52
|
四元阵预设修改提交
|
2021-07-20 12:37:14 +08:00 |
jiaoyangna
|
6ed3b05885
|
四元阵修改提交
|
2021-07-16 17:59:22 +08:00 |
jiaoyangna
|
ea704d62c3
|
Revert "四元阵修改提交"
This reverts commit f33d64871a.
|
2021-07-16 17:58:13 +08:00 |
jiaoyangna
|
f33d64871a
|
四元阵修改提交
|
2021-07-16 17:57:45 +08:00 |
jiaoyangna
|
bec2eca580
|
适配修改
|
2021-07-16 15:51:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
324ba7bc57
|
文字内容修改提交
|
2021-07-16 15:04:09 +08:00 |
DESKTOP-98AVA47\Administrator
|
aae52de39b
|
去掉已获得屏蔽
|
2021-07-16 14:46:21 +08:00 |
DESKTOP-98AVA47\Administrator
|
0aa779f177
|
添加左右切换按钮
|
2021-07-16 14:18:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
0a4ef7e68d
|
心愿抽卡修改提交
|
2021-07-16 11:40:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
89925e511a
|
抽卡调整
|
2021-07-16 10:15:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7187d75c4
|
预设调整,左右红点切换界面调整
|
2021-07-16 10:12:41 +08:00 |
luyao
|
b8afca215b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 21:10:50 +08:00 |
luyao
|
2fbecd6584
|
文字修改提交
|
2021-07-15 21:10:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
af7e58f531
|
位置修改
|
2021-07-15 21:02:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
53dadfff49
|
抽卡修改提交
|
2021-07-15 20:48:46 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b413e06e2
|
神将抽加号修改
|
2021-07-15 20:08:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
385dcb9c90
|
位置修改交
|
2021-07-15 19:47:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
6d4bf07c21
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:38:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
01a2171a31
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:33:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
c5ceba8603
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 18:51:51 +08:00 |
ZhangBiao
|
32654b045a
|
抽卡资源提交
|
2021-07-15 11:57:24 +08:00 |
jiaoyangna
|
f710e20c60
|
抽卡红点提交
|
2021-07-10 18:12:50 +08:00 |
jiaoyangna
|
894e7d7c46
|
抽卡动画播放时。去掉跳过按钮,改为点击屏幕任意位置,即可跳过动画,界面内增加
|
2021-07-09 13:39:24 +08:00 |
jiaoyangna
|
30ab410f00
|
抽卡优化
|
2021-07-08 18:40:43 +08:00 |
ZhangBiao
|
bb70e92ca4
|
【心愿抽卡】界面微调
(cherry picked from commit bbe3fec745)
|
2021-07-01 18:02:21 +08:00 |
ZhangBiao
|
3675ec9699
|
【心愿抽卡】取消按钮入场动画
|
2021-06-30 14:41:02 +08:00 |