Commit Graph

543 Commits (52926012d6fc7d038e07f7350131844bdce73702)

Author SHA1 Message Date
wangzhenxing cdd025503f 战斗技能名称显示修改 2023-12-04 15:47:15 +08:00
wangzhenxing 6e981aa05d 战斗技能名称显示修改 2023-12-04 14:22:53 +08:00
xiejun 4906264a04 战斗多段 2023-12-02 16:57:39 +08:00
xiejun 941c15890c 战斗表现修改 2023-11-30 13:38:19 +08:00
wangzhenxing 22ec1e1baa 伤害记录界面修改提交 2023-11-14 13:50:52 +08:00
wangzhenxing d5ed3cf71b 战斗修改 我要变强,战斗伤害记录入口屏蔽 2023-11-13 18:28:01 +08:00
xiejun 7d4c58f026 修行界面 2023-11-13 18:05:45 +08:00
xiejun d988829154 战斗场景根据配置加载 2023-11-09 18:22:16 +08:00
wangzhenxing 477f3356d8 战斗添加空判断,结算界面修改 2023-11-09 17:29:29 +08:00
xiejun e09a6a9c23 战斗背景替换和战斗逻辑的修改 2023-11-09 16:00:30 +08:00
xiejun 16859c0aa7 修改spine缩放不正常的bug 2023-11-08 17:43:15 +08:00
xiejun ba00dc1132 战斗新增修改spine动画缩放 2023-11-08 16:35:53 +08:00
xiejun 0cd03f3dc8 战斗spine播放错误bug 2023-11-07 19:05:57 +08:00
xiejun dd16083da3 战斗部分修改 2023-11-07 18:08:43 +08:00
xiejun b5fcc6e3f4 修改战斗表现代码 2023-10-28 17:55:30 +08:00
xiejun c8ffd1e928 修改位移判断 2023-10-28 17:40:31 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun ee77f40d05 修改战斗BUG 2023-10-23 17:04:59 +08:00
xiejun fe4dec2a64 修改战斗位移BUG 2023-10-23 15:09:31 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
xiejun 5c4e04a1be 修改代码 2023-09-19 18:56:46 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
xiejun 731ca32f5b 修改BUG 2023-09-04 15:40:11 +08:00
xiejun 3993a248c0 修改bUG 2023-09-04 15:21:09 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun e50aa15b47 修改代码 2023-08-30 21:33:02 +08:00
xiejun f42141a40e 修改灵兽代码 2023-08-30 21:31:29 +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
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun edebfb4d63 修改bug 2023-08-16 10:49:55 +08:00
xiejun 15b598237e 修改bug 2023-08-15 15:50:24 +08:00
xiejun 49df3050d1 代码 2023-08-15 13:31:06 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
xiejun 87dfec134c 修改代码 2023-07-13 17:04:48 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun 0bb8dfbb6e 凱多的live2d 2023-06-29 15:04:58 +08:00
xiejun f52a94841e 修改战斗的代码,已经调整live2D 2023-06-28 15:58:29 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
yuanshuai 4ece26aaf4 七界试炼输了也消耗挑战次数bug修复 2023-05-10 14:31:18 +08:00
yuanshuai 9f4109c16f 七界试炼bug修复 2023-05-08 15:00:52 +08:00
wangzhenxing 7c2598c7e7 英雄属性添加时空英雄属性 2023-04-19 17:49:29 +08:00
wangzhenxing be9f720590 [战斗]======神兵服务器发过来的数据处理 2023-04-07 16:11:39 +08:00
wangzhenxing 0681ff2a30 [战斗]=========战斗去除无用log 2023-04-07 11:33:50 +08:00
wangzhenxing cbd60b5e14 [战斗]==================战斗添加神兵 2023-04-06 14:02:32 +08:00
wangzhenxing 1c60b69d1a [战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制 2023-02-24 11:02:14 +08:00
wangzhenxing de59133024 【战斗】===========添加 buff金刚印记 2023-02-15 18:48:53 +08:00
wangzhenxing 48e172ae28 云梦好礼红点修改,伤害结算界面星级修改 2023-01-27 10:49:10 +08:00
wangzhenxing a3a8277390 战斗表现修改提交 2023-01-13 14:41:41 +08:00
wangzhenxing 4ca7445e8b 跳过战斗修改 2023-01-04 18:16:08 +08:00
wangzhenxing 2d35f6f270 [bt]======添加战斗跳过 2022-12-07 11:41:20 +08:00
wangzhenxing 51c7375d65 【战斗】==========人物受击后立绘变红 2022-11-16 13:31:13 +08:00
wangzhenxing 97036e465d 刷冲特权修改,战斗三倍速修改 2022-11-03 16:29:37 +08:00
wangzhenxing ce0df44e22 [战斗]=======战斗我方不显示立绘 2022-11-03 14:39:58 +08:00
wangzhenxing 37c8d8f6a8 [战斗]======逻辑修改 2022-08-03 14:20:57 +08:00
wangzhenxing bf9efec5c6 [战斗]========战斗名称显示修改 2022-06-29 14:54:23 +08:00
wangzhenxing f4545f127c 战斗表现修改 2022-05-24 14:09:01 +08:00
wangzhenxing bbd485f56f [假战斗]=====修改 2022-05-24 13:35:24 +08:00
wangzhenxing 3e75dc9f6f [假战斗]======修改提交 2022-05-24 11:57:47 +08:00
wangzhenxing 09f2f05214 【战斗】=====如果之前是3倍速,就转成二倍速 2022-05-16 13:40:53 +08:00
wangzhenxing e337559c30 【战斗】=======屏蔽战斗三倍数,2倍速改为2.5倍速 2022-05-16 13:23:16 +08:00
yuanshuai d247989586 挑战副本bug修改 2022-04-21 18:43:24 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
wangzhenxing 0cad07009a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-19 17:24:53 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
yuanshuai 3c72cd688b 挑战副本bug修改 2022-04-19 16:14:55 +08:00
yuanshuai 24bf6c63e4 挑战副本脚本修改 2022-04-19 15:52:50 +08:00
yuanshuai b907383826 挑战副本脚本修改 2022-04-19 11:53:08 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
wangzhenxing 01b3a8c35b 【战斗】=======护盾效果表现修改 2022-03-17 16:50:40 +08:00
wangzhenxing 008b3671c4 [战斗]======buff提示文字修改 2022-03-14 17:10:15 +08:00
wangzhenxing a27d510730 【被动】===========339修改 2022-03-02 14:07:52 +08:00
gaoxin 4c00b471ad 【战斗】添加头像显示 2022-01-21 11:59:19 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
wangzhenxing 853fde91b2 [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
gaoxin 8351aba49c 【战斗】我方buff显示位置修改 2022-01-13 13:56:08 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
wangzhenxing 33f1934d02 【战斗】========角色皮肤释放技能表现修改 2021-12-29 13:08:32 +08:00
wangzhenxing d3253c5edb 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
gaoxin cf87db6577 Merge branch 'china/dev' into china/dev_res 2021-12-23 11:05:25 +08:00
wangzhenxing 4a6ee9d9aa [战斗]==========战斗记录界面死亡置灰修改 2021-12-20 17:00:12 +08:00
wangzhenxing 885a6e2fa8 [功能]========结算记录界面添加阵亡标签 2021-12-20 15:32:28 +08:00
wangzhenxing e02f9a7881 [战斗]======角色播放 skill 动作逻辑提交 2021-12-20 10:02:38 +08:00
wangzhenxing d9f1670993 【战斗】====战斗gm报错修改 2021-12-16 10:24:36 +08:00
wangzhenxing 020d8b1b05 [功能]=======战斗统计死亡单位置灰 2021-12-15 15:07:20 +08:00
wangzhenxing 9f2a977b07 [功能]=========战斗统计界面添加死亡置灰 2021-12-15 09:44:35 +08:00
gaoxin 1691fd03da 【战斗】优化身外化身casting显示时间 2021-12-14 13:51:41 +08:00
gaoxin c680ea0940 【战斗跳过】跳过限制只对关卡战斗生效 2021-12-13 17:17:51 +08:00
gaoxin ec916ef6f0 【引导战斗】修复casting层级错误,修复男女角色显示错误 2021-12-13 17:07:31 +08:00
gaoxin 064505813a 【战斗】修复战斗结束后立刻再进入战斗会报错卡死 2021-12-13 16:25:09 +08:00
gaoxin eeda6a80c5 【战斗】修复主角技能卡死 2021-12-10 18:27:51 +08:00
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00