Commit Graph

50 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
xiejun 0ccaffd591 四海历练 2023-12-28 16:44:58 +08:00
PC-202302260912\Administrator 6414ad3b6a 修改文字 2023-12-13 11:19:24 +08:00
xiejun 04dcb81b8a 修改四海副本的UI 2023-12-11 16:14:28 +08:00
xiejun 52726874dd 四海历练相关 2023-12-08 23:57:58 +08:00
PC-202302260912\Administrator ecf3c60d45 修改名字 2023-12-08 22:53:04 +08:00
xiejun 100980e98b 删除老预制体 2023-10-23 17:51:23 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
xiejun 96efe07502 prefab布鲁克 2023-08-29 19:18:35 +08:00
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 84a9fd51f6 心魔挑战开启快速挑战 2023-02-13 18:33:35 +08:00
wangzhenxing 0ed8fcf2f4 [心魔]======红点优化 2022-11-08 15:58:18 +08:00
gaoxin c795995bf6 【心魔试炼】奖励按钮显示错误 2022-01-10 14:33:20 +08:00
gaoxin 662ad26223 【优化】心魔/四灵试炼增加编队按钮 2022-01-05 17:25:39 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
gaoxin 5044a79789 Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489.
2021-11-01 18:59:11 +08:00
zhangshanxue 2901a60489 Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392.
2021-11-01 18:53:54 +08:00
ZhangBiao 75827dc392 【界面优化】心魔试炼、战斗统计、法宝进阶 2021-11-01 15:36:40 +08:00
jiaoyangna 88f88d1249 适配修改提交 2021-09-02 11:20:18 +08:00
jiaoyangna 1245d7635d 四灵修改 2021-09-01 11:02:07 +08:00
jiaoyangna 49a4b32138 四灵第二次修改 2021-09-01 10:43:57 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna 0027722366 四灵修改提交 2021-08-30 20:07:20 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
jiaoyangna 1cff130e45 【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
2021-07-29 14:38:13 +08:00
wangzhenxing 7d9edd42dd [ui]==============心魔试炼适配修改提交 2021-07-03 18:28:18 +08:00
wangzhenxing c082a3c3d6 【功能】===========心魔试炼预设修改 2021-07-03 17:24:46 +08:00
zhangqiang dbe2b1f3ea 【心魔试炼】资源替换2 2021-06-30 16:29:37 +08:00
zhangqiang bd27e2094b 【心魔试炼】资源替换 2021-06-30 16:03:40 +08:00
zhangqiang d21ebe57bb 【心魔试炼】2 2021-06-09 20:12:11 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
gaoxin 006eae4bd9 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00
jiaoyangna 7c5fd4408e 本地化提交 2021-03-05 14:00:45 +08:00
gaoxin ce0a7ed874 【本地化】界面显示优化 2021-01-29 14:09:52 +08:00
gaoxin 12356f5ed7 【本地化】预设提交 2021-01-26 17:48:24 +08:00
jiaoyangna 687c5fa957 红点提交 2021-01-13 14:29:56 +08:00
jiaoyangna a5a93d43a7 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-07 19:24:04 +08:00
zhangqiang c35058767b shi pei 2020-09-05 15:20:30 +08:00
gaoxin 13ab0dc54f 小弹窗界面屏幕适配修改 2020-09-02 10:29:55 +08:00
zhangqiang f68a1b868a 四元阵 抽卡 兽潮主 2020-09-01 17:35:10 +08:00
zhangqiang b2a54634d2 适配调整 巅峰赛入口 2020-08-15 00:08:25 +08:00
jiaoyangna c3e1aaff6e 【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
2020-07-09 13:35:59 +08:00
2han9B1a0 abfbfc423b 心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改 2020-07-03 11:27:25 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00