Commit Graph

1137 Commits (52926012d6fc7d038e07f7350131844bdce73702)

Author SHA1 Message Date
xiejun 705b651886 修改skillcast 2023-12-14 17:34:20 +08:00
xiejun 25dc5ca5a9 修改战斗 2023-12-13 19:08:39 +08:00
xiejun e37655c32e 修改追击的effect,增加延迟 2023-12-13 15:15:32 +08:00
xiejun 787aeaca12 战斗修改 2023-12-13 11:19:32 +08:00
wangzhenxing d377552a80 战斗立绘显示修改 2023-12-08 15:59:06 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
wangzhenxing 9d7def32b3 变身卡表现修改 2023-12-05 18:00:32 +08:00
xiejun 22a572bf60 技能GM 2023-12-04 19:17:56 +08:00
wangzhenxing 97990f0364 命格修改提交 2023-12-04 18:16:30 +08:00
wangzhenxing f1746010d1 主角立绘显示修改 2023-12-04 17:19:01 +08:00
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
wangzhenxing cfe5e05df6 [战斗]=====================技能命中添加判断 2023-11-13 14:07:02 +08:00
wangzhenxing ca6c9cc5be 【战斗】========================去除无用log 2023-11-11 11:03:37 +08:00
wangzhenxing d594debd41 [战斗]=========神兵技能修改 2023-11-10 19:00:50 +08:00
wangzhenxing 1642a786a9 挂机金币按钮提交 2023-11-10 18:53:24 +08:00
wangzhenxing 81ed03a059 [战斗]===================技能效果添加空判断 2023-11-10 18:00:41 +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
wangzhenxing 325bdc2b2d 【战斗】======================被动355修改 2023-10-30 10:29:04 +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 6d3d4b067c 战斗编辑器BUg修复 2023-10-25 18:15:21 +08:00
wangzhenxing eb746bccfc [战斗]===================effect 160修改 2023-10-24 11:27:34 +08:00
xiejun 007f87d9dd 战斗添加判空 2023-10-23 20:21:37 +08:00
xiejun ee77f40d05 修改战斗BUG 2023-10-23 17:04:59 +08:00
xiejun fe4dec2a64 修改战斗位移BUG 2023-10-23 15:09:31 +08:00
wangzhenxing 3f12999263 [战斗]===========================注释无用注释 2023-10-20 18:30:02 +08:00
wangzhenxing e93a0dbf49 Merge branch 'dev_oneDis' into onepiece_demo 2023-09-28 15:49:22 +08:00
wangzhenxing 49bf0b384a [战斗]=============被动480修改 2023-09-26 16:21:41 +08:00
wangzhenxing fd00808d2d Merge branch 'dev_oneDis' into onepiece_demo 2023-09-25 10:50:09 +08:00
wangzhenxing 3dfc21e7b9 [战斗]=======================被动添加480 481 2023-09-25 10:49:27 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
wangzhenxing 33419ff012 [战斗]====================效果添加163 164 2023-09-20 18:42:20 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
xiejun 5c4e04a1be 修改代码 2023-09-19 18:56:46 +08:00
wangzhenxing bb1ea1c7f8 [战斗]=======================添加主角连击逻辑 2023-09-19 18:49:29 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing 51dc91cbda [战斗]=======================效果162 提交
(cherry picked from commit 56736a3aca)
2023-09-15 14:18:14 +08:00
wangzhenxing 56736a3aca [战斗]=======================效果162 提交 2023-09-14 16:20:43 +08:00
xiejun ccb0cd4838 修改混乱之后角色不行动的BUG 2023-09-11 17:59:32 +08:00
wangzhenxing b2e7822bf1 【战斗】===============效果10修改提交 2023-09-08 14:09:13 +08:00
wangzhenxing db3b8d9562 【战斗】====================被动添加479 2023-09-04 18:45:16 +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
wangzhenxing 595487091b 【战斗】=======battlelogic修改 2023-08-25 18:58:32 +08:00
wangzhenxing 47edf3b630 【战斗】==================被动477 478修改 2023-08-25 18:32:56 +08:00
wangzhenxing 0d6566c725 【战斗】============被动472修改 2023-08-25 17:14:55 +08:00
wangzhenxing d9778dbae4 【战斗】=================被动修改提交 2023-08-25 16:03:57 +08:00
wangzhenxing 91c292a809 [战斗]================被动475修改 2023-08-25 11:49:56 +08:00
wangzhenxing d28ca0a5fb 【战斗】===============新英雄被动修改 2023-08-24 18:20:04 +08:00
wangzhenxing 461029ab50 [战斗]=================战斗battleutil 修改 2023-08-24 14:48:59 +08:00
wangzhenxing 4205ce3afc [战斗]==============被动474修改 2023-08-24 10:27:30 +08:00
wangzhenxing 178ba22181 [战斗]======================时空女儿国王 新英雄提交 2023-08-23 16:33:16 +08:00
xiejun 15e6d575d0 修改战斗编辑器 2023-08-16 14:40:51 +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
wangzhenxing d4585f2c97 【战斗】=====================被动添加470 2023-07-21 17:46:35 +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
wangzhenxing 543bdb6579 =====================战斗修改及添加log 2023-07-04 17:43:52 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
wangzhenxing cea83cf20a 战斗兼容老板剧情英雄释放技能 2023-06-07 16:26:57 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
yuanshuai f472f8ba83 嘲讽技能修改提交 2023-05-17 16:36:35 +08:00
yuanshuai f390986b97 嘲讽技能修改 2023-05-17 16:12:30 +08:00
yuanshuai 7fc9813a7f 时空猪八戒技能修改 2023-05-16 15:19:44 +08:00
yuanshuai 86ece9cc1f 技能修改 2023-05-16 09:57:52 +08:00
yuanshuai d73e8d0bfc 受到伤害时,如果攻击者处于嘲讽状态回复自身[a]点怒气 2023-05-15 18:21:04 +08:00
yuanshuai 8005fbe6d7 时空猪八戒被动提交 2023-05-15 17:38:51 +08:00
yuanshuai de787a85f7 天蓬相关技能提交 2023-05-12 16:55:47 +08:00
yuanshuai 4ece26aaf4 七界试炼输了也消耗挑战次数bug修复 2023-05-10 14:31:18 +08:00