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 |
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
|
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 |
wangzhenxing
|
d4585f2c97
|
【战斗】=====================被动添加470
|
2023-07-21 17:46:35 +08:00 |
xiejun
|
ed0681d015
|
路飞,萨博
|
2023-07-17 18:47:07 +08:00 |
xiejun
|
937ec44bf5
|
立绘和代码修改
|
2023-07-13 14:38:34 +08:00 |
xiejun
|
ab2e8eb833
|
增加技能特效spine
|
2023-07-06 14:08:10 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
xiejun
|
0bb8dfbb6e
|
凱多的live2d
|
2023-06-29 15:04:58 +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
|
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 |
wangzhenxing
|
7c2598c7e7
|
英雄属性添加时空英雄属性
|
2023-04-19 17:49:29 +08:00 |
wangzhenxing
|
2b06b98c0b
|
【战斗】=========技能147修改
|
2023-04-19 15:20:19 +08:00 |
wangzhenxing
|
db154ba52b
|
【战斗】=============被动464修改
|
2023-04-18 16:42:35 +08:00 |
wangzhenxing
|
001e399620
|
[战斗]=========被动464 修改
|
2023-04-18 15:42:27 +08:00 |
wangzhenxing
|
2f17b7af58
|
[战斗]=======新英雄技能被动修改提交
|
2023-04-18 14:28:17 +08:00 |
wangzhenxing
|
14c546f315
|
【战斗】==============新将战斗修改提交
|
2023-04-14 16:53:08 +08:00 |
wangzhenxing
|
9b40cb5314
|
[战斗]======被动327修改
|
2023-04-12 17:44:00 +08:00 |