Commit Graph

57 Commits (cd858da64f56c9dd1947583ea567b50459fddae8)

Author SHA1 Message Date
xiejun 07e72f4829 修改ExpeditionMonsterInfoPopup预制体 2023-11-14 17:12:24 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +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 f44f70085b 【bug】=====七界阵容条件修改 2022-04-01 15:09:57 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
gaoxin bb685191dd 【优化】设置物品显示的方法改为通用方法 2021-11-26 14:27:24 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
ZhangBiao 3b02c6296c 【宝器属性】穿戴宝器后,游戏退出重进宝器属性没有加上,导致战力值下降 2021-10-29 14:20:21 +08:00
ZhangBiao 5d15c33605 【优化】跨服战红点跨天后不显示,完成所有操作后红点不消失,需要重新进入 2021-10-29 13:28:04 +08:00
gaoxin a1449fd504 【七界试炼】修复跨天红点不刷新的维妮塔 2021-10-27 15:14:47 +08:00
ZhangBiao a9e430c755 【七界试炼】【优化】七界试炼优化上下层提示 2021-10-19 09:33:37 +08:00
ZhangBiao e4250d3fac 【七界试炼】红点不再请求数据 2021-09-27 15:33:30 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
ZhangBiao 1505647241 【七界试炼】框位不齐 2021-09-24 17:02:38 +08:00
ZhangBiao 35091621dc 【七界试炼】提交 2021-09-24 16:52:05 +08:00
ZhangBiao 028f97c195 【七界试炼】红点和跳转i需改 2021-09-24 16:47:06 +08:00
ZhangBiao ce1a5f25ea 【七界试炼】奖励位置调整 2021-09-24 15:11:57 +08:00
ZhangBiao b0e24676b3 【七界试炼】增加秘宝入口开启处理 2021-09-24 14:57:04 +08:00
ZhangBiao c9305b4247 【七界试炼】提交 2021-09-24 14:06:09 +08:00
ZhangBiao 8bd1896aba 【七界试炼】敌方英雄展示修改 2021-09-24 10:27:56 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
ZhangBiao fc03b71b84 【七界试炼】tijiao 2021-09-23 14:21:30 +08:00
ZhangBiao 9bac3f850e 【七界试炼】提交 2021-09-23 14:13:34 +08:00
ZhangBiao 5c11a67393 【七界试炼】修改提交 2021-09-23 12:01:58 +08:00
ZhangBiao 32585cec01 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +08:00
ZhangBiao 0b9055110d 【七界试炼】红点 2021-09-22 16:25:29 +08:00
ZhangBiao 40fb962879 【七界试炼】合并后提交 2021-09-22 15:19:27 +08:00
ZhangBiao 47485caeda 【七界试炼】无免费次数按钮逻辑修改 2021-09-18 18:23:48 +08:00
ZhangBiao 1ddc89ad54 【七界试炼】提交 2021-09-18 18:18:22 +08:00
ZhangBiao 634f78d3c5 【七界试炼】提交 2021-09-18 16:52:06 +08:00
ZhangBiao 35e0c96748 【七界试炼】提交 2021-09-18 15:04:32 +08:00
ZhangBiao 1910d54272 【七界试炼】提交 2021-09-18 10:29:30 +08:00
ZhangBiao 8307fbe7e1 【七界试炼】完成!!! 2021-09-17 19:57:45 +08:00
ZhangBiao 949d159010 【七界试炼】提交 2021-09-17 19:29:58 +08:00
ZhangBiao ad4c218f01 【七界试炼】提交 2021-09-17 13:42:27 +08:00
ZhangBiao 4d8576d200 【七界试炼】战斗层数锁住了 2021-09-16 21:05:43 +08:00
ZhangBiao 60c954bf38 【七界试炼】提交 2021-09-16 19:36:16 +08:00
ZhangBiao 512a12cc72 【七界试炼】提交 2021-09-16 11:24:35 +08:00
ZhangBiao 45de3d5c99 【七界试炼】提交 2021-09-15 18:09:21 +08:00
ZhangBiao ad9bcaa2fa 【七界试炼】提交 2021-09-15 14:02:39 +08:00
ZhangBiao b609616b6b 【七界试炼】提交 2021-09-13 18:06:39 +08:00
ZhangBiao c68496654f 【七界试炼】遗物 2021-09-13 13:54:58 +08:00
ZhangBiao 8c9f31f028 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
ZhangBiao 41282c144c 【七界试炼】七界币增加加号 2021-09-11 15:47:19 +08:00
ZhangBiao 4eb8e566fe 【七界试炼】战斗结束提交 2021-09-10 18:36:39 +08:00
ZhangBiao 42df2f4af5 【七界试炼】提交 2021-09-10 15:23:15 +08:00
ZhangBiao cef2b42bcc 【七界试炼】提交 2021-09-10 10:30:50 +08:00