wangzhenxing
|
81ed03a059
|
[战斗]===================技能效果添加空判断
|
2023-11-10 18:00:41 +08:00 |
xiejun
|
dd16083da3
|
战斗部分修改
|
2023-11-07 18:08:43 +08:00 |
wangzhenxing
|
eb746bccfc
|
[战斗]===================effect 160修改
|
2023-10-24 11:27:34 +08:00 |
xiejun
|
007f87d9dd
|
战斗添加判空
|
2023-10-23 20:21:37 +08:00 |
wangzhenxing
|
3f12999263
|
[战斗]===========================注释无用注释
|
2023-10-20 18:30:02 +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
|
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 |
wangzhenxing
|
b2e7822bf1
|
【战斗】===============效果10修改提交
|
2023-09-08 14:09:13 +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
|
178ba22181
|
[战斗]======================时空女儿国王 新英雄提交
|
2023-08-23 16:33:16 +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 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
yuanshuai
|
de787a85f7
|
天蓬相关技能提交
|
2023-05-12 16:55:47 +08:00 |
wangzhenxing
|
2b06b98c0b
|
【战斗】=========技能147修改
|
2023-04-19 15:20:19 +08:00 |
wangzhenxing
|
2f17b7af58
|
[战斗]=======新英雄技能被动修改提交
|
2023-04-18 14:28:17 +08:00 |
wangzhenxing
|
14c546f315
|
【战斗】==============新将战斗修改提交
|
2023-04-14 16:53:08 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
47074a40d0
|
[战斗]=========新英雄技能被动提交
|
2023-03-01 17:24:25 +08:00 |
wangzhenxing
|
91710e2985
|
[战斗]========================效果添加152,添加筛选逻辑权重
|
2023-02-01 16:13:50 +08:00 |
wangzhenxing
|
d557b603b3
|
【战斗】=================效果 151提交
|
2023-01-11 11:44:40 +08:00 |
wangzhenxing
|
44ffc110e7
|
[战斗]=======效果10 修改
|
2022-08-08 14:12:42 +08:00 |
wangzhenxing
|
3e5b67ddf6
|
【技能】=========149 150 修改提交
|
2022-03-18 16:29:03 +08:00 |
wangzhenxing
|
9e010245fe
|
[战斗]========技能149 被动429 430 431修改提交
|
2022-03-18 15:47:16 +08:00 |
wangzhenxing
|
0f2eebfe42
|
[战斗]===================被动433修改 技能添加148
|
2022-03-17 16:15:34 +08:00 |
wangzhenxing
|
3fde93fcd7
|
【战斗】=========效果108修改
|
2022-02-11 16:27:27 +08:00 |
wangzhenxing
|
599ef2e0fc
|
[战斗]=========被动356 422 技能: 108修改
|
2022-02-10 15:29:24 +08:00 |
wangzhenxing
|
cff6c3f21b
|
[战斗]=====被动418-421提交
|
2022-01-14 13:49:39 +08:00 |
wangzhenxing
|
25bc46e049
|
[战斗]======被动197 技能126 147修改
|
2021-12-16 16:13:01 +08:00 |
wangzhenxing
|
52937f3a67
|
[战斗]======效果133修改,治疗接口添加容错
|
2021-12-13 11:50:50 +08:00 |
wangzhenxing
|
150e37ae78
|
[战斗]======效果144修改 护盾buff修改
|
2021-12-10 15:22:18 +08:00 |
wangzhenxing
|
33d25289b3
|
【战斗】=======变身卡技能提交
|
2021-12-10 11:52:10 +08:00 |
wangzhenxing
|
b9763ad25e
|
【战斗】=====变身卡提交
|
2021-12-03 17:17:47 +08:00 |
wangzhenxing
|
bbef7796ca
|
[战斗]=======第四期神魂
|
2021-12-02 17:42:31 +08:00 |
wangzhenxing
|
0cef7683ba
|
[战斗]======效果137修改 立绘朝向修改
|
2021-11-29 17:53:17 +08:00 |
wangzhenxing
|
85a12ae9d8
|
[身外化身]========身外化身立绘朝向修改
|
2021-11-27 15:14:22 +08:00 |
wangzhenxing
|
587a5cfc2e
|
[战斗]=======133 136 137效果修改
|
2021-11-26 18:05:16 +08:00 |
wangzhenxing
|
5449b2357d
|
[战斗]=====效果132修改
|
2021-11-26 09:36:41 +08:00 |
wangzhenxing
|
aff13f8904
|
【战斗】======技能132-140提交
|
2021-11-25 15:07:40 +08:00 |
gaoxin
|
ecedea90f8
|
Merge branch '0功能/新增克制属性' into china/dev
|
2021-11-18 10:49:34 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
gaoxin
|
ce5042eb86
|
【克制属性】添加
|
2021-11-16 16:59:59 +08:00 |