Commit Graph

724 Commits (3ca88e04a9eca908de5b9a373a4d3d0158c96e15)

Author SHA1 Message Date
xiejun 3ca88e04a9 战力和角色信息UI修改 2023-12-08 16:34:08 +08:00
xiejun 71140a84d7 特训BUG 2023-12-08 11:23:14 +08:00
wangzhenxing c3334a5d98 更换名称 2023-12-07 01:11:27 +08:00
wangzhenxing 41716e2650 竞技场屏蔽奖励 防守记录入口 竞技场结果界面屏蔽回放 2023-12-06 19:07:04 +08:00
xiejun 99ac349d8c 修改角色界面ui 2023-12-05 18:16:33 +08:00
wangzhenxing 722476d6f1 角色信息修改提交 2023-12-05 15:59:32 +08:00
xiejun c710393297 特训红点 2023-11-30 20:17:27 +08:00
xiejun b9d5a38850 特训UI修改 2023-11-30 15:23:29 +08:00
xiejun b261ab62d6 修改UI 2023-11-29 20:48:01 +08:00
xiejun bacab5b38b 特训修改 2023-11-29 17:00:29 +08:00
wangzhenxing e0678dcb7c 觉醒修改 2023-11-29 15:11:22 +08:00
xiejun 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00
wangzhenxing 5210074f75 英雄升级信息显示修改 2023-11-28 13:57:33 +08:00
wangzhenxing 8be79fa29f 特训修改 2023-11-27 18:04:43 +08:00
wangzhenxing 3f49232c84 修行增加主角属性 2023-11-24 18:30:31 +08:00
xiejun 5b4dbf3c92 角色特训的数据结构和uidata 2023-11-21 17:34:34 +08:00
xiejun 0a5530667b 神将页面礼物按钮修改 2023-11-15 16:38:46 +08:00
xiejun a9aed6cf19 修改角色界面按钮选中状态 2023-11-15 14:15:25 +08:00
wangzhenxing 0939d80af9 角色信息界面修改 2023-11-13 18:46:25 +08:00
wangzhenxing 220e56f8c7 英雄列表界面修改 2023-11-06 14:10:55 +08:00
wangzhenxing ad48afbfe9 礼物界面修改提交 2023-10-31 16:23:50 +08:00
wangzhenxing 2ca32992da 装备共鸣屏蔽 2023-10-30 10:30:39 +08:00
xiejun cd9a898c46 神将天赋字号颜色 2023-10-27 20:48:34 +08:00
wangzhenxing c625b8d011 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-27 17:09:21 +08:00
wangzhenxing dd9444c745 屏蔽英雄觉醒显示 2023-10-27 17:09:16 +08:00
xiejun 8ef7efa6c1 达人活动UI和神印BUG 2023-10-27 16:41:28 +08:00
wangzhenxing 2134fa658d 法宝添加开启条件,抽卡显示修改 2023-10-27 10:57:03 +08:00
wangzhenxing 9a1646ec48 法宝升级显示修改 2023-10-26 20:54:06 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
wangzhenxing ae5b5962b8 注释登录发送鸿蒙阵请求 2023-10-16 18:31:34 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
wangzhenxing 546e6d4627 主城屏蔽鸿蒙阵入口,英雄属性信息去掉公会技能入口 2023-10-11 11:24:32 +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
wangzhenxing b0650bbb20 主角礼物显示修改 2023-09-21 16:41:59 +08:00
wangzhenxing 97fc7811be 英雄礼物显示修改 2023-09-21 15:18:13 +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 a9150906de 礼物红点修改提交 2023-09-20 16:55:15 +08:00
wangzhenxing b8a15b703b 礼物特效层级修改提交 2023-09-20 16:33:01 +08:00
wangzhenxing 5f6d51786d 礼物显示修改 2023-09-20 15:41:36 +08:00
wangzhenxing 266c5b12af 礼物修改 点将神符不足弹出提示 2023-09-20 14:37:05 +08:00
wangzhenxing f0919b9ce8 礼物红点提交 2023-09-20 11:28:57 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing 4b34e64de7 工会开启 工会技能 2023-09-06 15:11:01 +08:00
wangzhenxing c889e67a43 英雄属性详情界面去除工会技能跳转 2023-09-04 16:57:01 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +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