Commit Graph

19 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
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
lihaiyang 138259e82e 嘲讽相关 2023-05-16 17:21:58 +08:00
lihaiyang 5f67dbc3fd 【战意】相关图标 2023-04-17 17:44:41 +08:00
yuanshuai ac104c73ca 预设修改 2023-04-07 14:32:34 +08:00
lihaiyang e615c5d7ce 添加神兵buff 2023-04-07 14:16:52 +08:00
lihaiyang bf13859e52 添加压制方面的图标 2023-03-03 15:18:03 +08:00
lihaiyang 4c0a6c1b1b 金刚印相关 2023-02-17 14:10:07 +08:00
wangzhenxing 69d1a45883 【战斗】=====反伤盾图片提交 2022-01-13 17:45:31 +08:00
wangzhenxing 58d08c65cc 【战斗】=======战斗buff图标资源提交 2021-12-13 14:31:06 +08:00
wangzhenxing 983864f46c 【战斗】=====抗暴率 提交字提交 2021-12-06 17:13:47 +08:00
wangzhenxing 402546b8ef 【战斗】=====buff图标提示文字资源提交 2021-12-03 18:34:40 +08:00
wangzhenxing 1a623036fa [战斗]============禁甲图片提交 2021-11-19 11:30:42 +08:00
wangzhenxing 24f0812b9f 主角技能提交 2021-10-20 21:33:37 +08:00
wangzhenxing cdd9f0a524 [战斗]====破盾状态字图片替换修改 2021-10-09 14:17:35 +08:00
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
wangzhenxing 2578107be4 【战斗】============战斗图片字显示修改 2021-06-30 18:06:56 +08:00
wangzhenxing aeed1703bd 【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交 2021-06-30 10:40:52 +08:00
wangzhenxing a02de7de2f [战斗]============战斗效果显示文字图片提交 2021-06-26 13:23:09 +08:00
JLIOSM1 cab9724de6 【ios】资源位置修改 2021-04-20 13:57:33 +08:00