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
|
ac172339ae
|
心愿抽卡修改提交
|
2023-05-27 19:04:30 +08:00 |
ZhangBiao
|
369f7aa1ef
|
【点将台】选择心愿神将,列表动画不正常
|
2022-01-17 14:26:17 +08:00 |
jiaoyangna
|
3369bcc73c
|
心愿修改提交
|
2022-01-14 18:40:00 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
jiaoyangna
|
b7b71930f5
|
进阶预览黑屏修改提交
|
2021-12-20 11:33:36 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
jiaoyangna
|
3f24f4cd86
|
四灵试炼 修改提交
|
2021-09-18 17:58:28 +08:00 |
DESKTOP-98AVA47\Administrator
|
60132143c7
|
新手引导修改提交
|
2021-07-16 11:19:36 +08:00 |
jiaoyangna
|
5450b9201a
|
心愿添加问号确认按钮
|
2021-07-10 18:50:39 +08:00 |
ZhangBiao
|
ffb80c8750
|
【特惠神装、心愿抽卡】适配、增加上方英雄长按
|
2021-07-02 11:54:33 +08:00 |
ZhangBiao
|
00ad684deb
|
【心愿抽卡】QA
|
2021-06-30 13:51:47 +08:00 |
ZhangBiao
|
55bdc21a99
|
【心愿抽卡】增加初始化操作
|
2021-06-30 12:01:39 +08:00 |
ZhangBiao
|
83fd6716e4
|
【心愿抽卡】增加长按查看操作
|
2021-06-30 10:58:35 +08:00 |
ZhangBiao
|
7d366000be
|
【心愿抽卡】完成
|
2021-06-30 10:52:05 +08:00 |
ZhangBiao
|
37e854190b
|
【心愿抽卡】增加所有抽卡类型和输出
|
2021-06-30 10:36:48 +08:00 |
ZhangBiao
|
ecb43803f4
|
【心愿抽卡】提交
|
2021-06-30 10:23:57 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +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 |