Commit Graph

766 Commits (2aa3d13593d17ee87ca0283d01bf9e83c348db07)

Author SHA1 Message Date
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
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
xiejun 734cb92be9 去掉pating和spriteloader相关的代码 2023-08-16 11:55:55 +08:00
xiejun 5d7fcc5aec 修改bug 2023-08-15 20:25:06 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing c32b71d3fc 变身卡无法升星修改,法宝超过10级显示修改 2023-08-02 14:46:18 +08:00
PC-202302260912\Administrator e7084afe68 法宝==================法宝特性激活显示等级修改 2023-07-18 16:08:15 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
PC-202302260912\Administrator 8bae77bd5b [法宝]====================法宝特性描述修改 2023-07-07 10:27:42 +08:00
PC-202302260912\Administrator 65f0eac110 法宝25级特性显示修改 2023-07-06 16:28:19 +08:00
wangzhenxing 250fa4d5ee 法相升星属性修改 2023-05-31 14:20:29 +08:00
wangzhenxing 075fd4ab01 鸿蒙阵下阵卸下装备修改 2023-04-24 17:34:12 +08:00
wangzhenxing a1c038b5c0 新英雄宝物修改提交 2023-04-19 13:49:21 +08:00
wangzhenxing 2f17b7af58 [战斗]=======新英雄技能被动修改提交 2023-04-18 14:28:17 +08:00
wangzhenxing 3a5076bb2e 法相佩戴条件修改 2023-03-10 16:55:37 +08:00
wangzhenxing 2985c1f5a2 法相装备修改提交 2023-02-21 14:20:46 +08:00
wangzhenxing 34077030ca 法相红点修改提交 2023-02-20 22:24:28 +08:00
wangzhenxing ff6f452f32 法相属性显示修改 2023-02-20 18:49:34 +08:00
wangzhenxing 0b88a77535 法相修改提交 2023-02-20 17:38:59 +08:00
wangzhenxing 91b13fb22c 法相显示修改提交 2023-02-20 16:20:17 +08:00
wangzhenxing db4d23bdfa Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang 2023-02-20 14:46:58 +08:00
wangzhenxing 76c81f44d4 法相增加属性计算修改 2023-02-20 14:46:37 +08:00
yuanshuai 250078eb33 一键装备法相bug修改 2023-02-20 14:25:44 +08:00
wangzhenxing d84f374bf2 法相修改提交 2023-02-19 20:08:48 +08:00
wangzhenxing 1f83739af1 法相升级升星提交 2023-02-18 22:21:24 +08:00
wangzhenxing 8cb653fcb4 Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang 2023-02-18 15:57:37 +08:00
wangzhenxing dd7394cc29 法相manager修改提交 2023-02-18 15:57:20 +08:00
yuanshuai c2f2f9255b 法相修改提交 2023-02-18 15:52:52 +08:00
wangzhenxing 7276228e94 法相manager提交 2023-02-18 15:41:04 +08:00
yuanshuai 98ddf9b5c2 法相相关脚本预设提交 2023-02-18 13:31:36 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
wangzhenxing 04ea826ab8 白金魂宝神应修改提交 2023-02-13 14:05:12 +08:00
wangzhenxing 15607b8b70 法宝合成修改提交 2023-01-13 10:46:41 +08:00
yuanshuai dcbfd1f4c7 一键升级bug修复 2022-12-28 13:59:16 +08:00
yuanshuai ec6592a0d3 一键升级bug修改 2022-12-28 13:47:06 +08:00
wangzhenxing 65ff601bfc 神应页签显示修改 2022-12-27 16:41:24 +08:00
wangzhenxing c36e9928f0 角色定位信息报错修改 2022-12-26 14:29:23 +08:00
wangzhenxing 136bc6c12a 英雄一键升级修改 2022-12-23 14:56:30 +08:00
yuanshuai 305ad1343b 一键升级修改 2022-12-19 15:27:18 +08:00
wangzhenxing 354d9894b4 飞升天赋描述显示修改 2022-12-06 17:38:41 +08:00
yuanshuai 3c2e86f97c 一键升级bug修改 2022-11-23 15:28:32 +08:00
yuanshuai 1545823af6 挑战副本修改提交 2022-11-16 14:01:40 +08:00
yuanshuai a04fb2ac2f Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt 2022-11-15 16:35:55 +08:00
yuanshuai 617d292b47 英雄一键升级 2022-11-15 16:35:48 +08:00
wangzhenxing 3a952c6753 英雄培养优化 2022-11-15 15:57:48 +08:00
wangzhenxing 7fc634bcf8 英雄升级材料不足提示修改 2022-11-07 17:40:10 +08:00
wangzhenxing 9fc80d7006 gm修改器显示修改提交 2022-11-04 17:49:27 +08:00
wangzhenxing d11e4a90cc 英雄升级突破材料不足提示 2022-11-04 16:28:16 +08:00
wangzhenxing 19ce8e51d5 英雄升星扩展 2022-11-03 14:33:09 +08:00
wangzhenxing 0543114a36 角色星级扩展 2022-11-02 16:26:40 +08:00
wangzhenxing da4b07d862 星级显示修改提交 2022-11-02 15:47:17 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
yuanshuai 489fd12db2 锻器阁 bug修改 2022-09-07 14:08:01 +08:00
yuanshuai d253c29e11 上限限制 2022-09-07 13:23:51 +08:00
yuanshuai 05d1eeeb6c 神应 上限修改 2022-09-07 13:21:27 +08:00
yuanshuai f6e27c21d3 神应相关属性战斗力修改 2022-09-07 11:40:13 +08:00
yuanshuai ef7373fe4a 宝物分解 2022-09-07 10:25:38 +08:00
yuanshuai d0d94401d4 魂宝灵宝分解 2022-09-07 10:14:05 +08:00