wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
d956e6050a
|
羁绊功能修改
|
2024-01-02 10:54:50 +08:00 |
xiejun
|
fee668a4d8
|
特训判断
|
2023-12-22 20:31:05 +08:00 |
wangzhenxing
|
dddcea85b4
|
特训中的英雄显示修改
|
2023-12-22 10:56:56 +08:00 |
xiejun
|
6ca07f6730
|
特训联动被动
|
2023-12-20 17:57:17 +08:00 |
wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
xiejun
|
c710393297
|
特训红点
|
2023-11-30 20:17:27 +08:00 |
PC-202302260912\Administrator
|
d78d5df5f2
|
魂印格子开启条件修改
(cherry picked from commit 0116983588 )
|
2023-11-30 15:13:12 +08:00 |
xiejun
|
4e6e0f29bd
|
角色特训
|
2023-11-28 21:31:01 +08:00 |
wangzhenxing
|
5210074f75
|
英雄升级信息显示修改
|
2023-11-28 13:57:33 +08:00 |
xiejun
|
14063f16eb
|
增加协议方法
|
2023-11-27 17:54:42 +08:00 |
wangzhenxing
|
37b4489aed
|
特训建筑修改
|
2023-11-21 18:59:58 +08:00 |
xiejun
|
5b4dbf3c92
|
角色特训的数据结构和uidata
|
2023-11-21 17:34:34 +08:00 |
xiejun
|
b02b37beaf
|
归元相关代码修改
|
2023-11-20 17:37:43 +08:00 |
wangzhenxing
|
902e27918f
|
活动按钮修改
|
2023-11-15 17:19:43 +08:00 |
wangzhenxing
|
dd9444c745
|
屏蔽英雄觉醒显示
|
2023-10-27 17:09:16 +08:00 |
wangzhenxing
|
b31c93e68b
|
装备神应显示修改
|
2023-10-27 16:22:27 +08:00 |
wangzhenxing
|
e795b4834b
|
法灵红点提交
|
2023-10-27 14:10:43 +08:00 |
wangzhenxing
|
0d08ea1a84
|
法灵提交
|
2023-10-26 17:16:10 +08:00 |
wangzhenxing
|
64d5426397
|
装备=============套装属性 技能显示修改
|
2023-10-17 15:47:10 +08:00 |
wangzhenxing
|
600ba71a04
|
属性===========================屏蔽装备套装增加属性
|
2023-10-17 10:53:58 +08:00 |
wangzhenxing
|
941cf283a9
|
装备属性修改
|
2023-10-16 19:03:24 +08:00 |
wangzhenxing
|
c43520367a
|
潜能红点提交
|
2023-10-16 17:11:07 +08:00 |
wangzhenxing
|
a66437ec72
|
潜能提交
|
2023-10-16 15:12:47 +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
|
e37b4befbd
|
礼物显示修改
|
2023-09-20 11:52:31 +08:00 |
wangzhenxing
|
f0919b9ce8
|
礼物红点提交
|
2023-09-20 11:28:57 +08:00 |
wangzhenxing
|
600f270128
|
礼物添加总属性显示,逍遥游寻仙修改
|
2023-09-19 18:03:00 +08:00 |
wangzhenxing
|
acdb5a21cd
|
礼物修改提交
|
2023-09-15 14:11:14 +08:00 |
wangzhenxing
|
eeb3859f72
|
礼物功能提交
|
2023-09-13 14:57:48 +08:00 |
wangzhenxing
|
2b93776f7c
|
命格修改提交
|
2023-09-01 17:36:15 +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
|
65d783dae1
|
修改BUG
|
2023-08-18 17:55:02 +08:00 |
wangzhenxing
|
9cb8cd4b06
|
玩家战斗力计算提交注释
|
2023-08-14 16:15:07 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
wangzhenxing
|
14db632938
|
屏蔽宝物 树添加的属性==================战斗力不一致问题
|
2023-08-09 17:57:35 +08:00 |
wangzhenxing
|
971ef8c453
|
变身卡战斗力计算修改
|
2023-08-08 15:45:14 +08:00 |
wangzhenxing
|
7f0038e9c4
|
宝物===========红点修改提交
|
2023-08-03 16:16:33 +08:00 |
xiejun
|
ab2e8eb833
|
增加技能特效spine
|
2023-07-06 14:08:10 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
PC-202302260912\Administrator
|
65f0eac110
|
法宝25级特性显示修改
|
2023-07-06 16:28:19 +08:00 |
wangzhenxing
|
a1c038b5c0
|
新英雄宝物修改提交
|
2023-04-19 13:49:21 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
wangzhenxing
|
12e2cecaa1
|
神兵属性,神兵羁绊,神兵分解提交
|
2023-04-04 11:15:32 +08:00 |
wangzhenxing
|
b094de690f
|
技能描述显示修改
|
2023-03-03 13:22:44 +08:00 |
wangzhenxing
|
6b718c2217
|
去除属性log
|
2023-02-20 21:07:24 +08:00 |
wangzhenxing
|
76c81f44d4
|
法相增加属性计算修改
|
2023-02-20 14:46:37 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |