Commit Graph

9596 Commits (b743ccd296ca9dc0bb5056b51c27960a0d5d76c0)

Author SHA1 Message Date
wangzhenxing a9d605e99d 选择特训英雄界面星级显示修改 2023-11-30 16:20:48 +08:00
xiejun b9d5a38850 特训UI修改 2023-11-30 15:23:29 +08:00
PC-202302260912\Administrator d78d5df5f2 魂印格子开启条件修改
(cherry picked from commit 0116983588)
2023-11-30 15:13:12 +08:00
xiejun 941c15890c 战斗表现修改 2023-11-30 13:38:19 +08:00
xiejun b261ab62d6 修改UI 2023-11-29 20:48:01 +08:00
PC-202302260912\Administrator 6d31ea6a3c 英雄图鉴显示法宝修改
(cherry picked from commit ebd474c54b)
2023-11-29 19:05:06 +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 8e4636f8de 特训选择英雄修改提交 2023-11-28 14:29:02 +08:00
wangzhenxing 5210074f75 英雄升级信息显示修改 2023-11-28 13:57:33 +08:00
wangzhenxing 07372d82b1 特训选择英雄显示修改 2023-11-28 11:06:48 +08:00
wangzhenxing 8be79fa29f 特训修改 2023-11-27 18:04:43 +08:00
xiejun 14063f16eb 增加协议方法 2023-11-27 17:54:42 +08:00
wangzhenxing fcc7b09685 特训升级修改 2023-11-27 14:40:54 +08:00
wangzhenxing b609eeb97c 特训添加帮助 2023-11-24 18:54:39 +08:00
wangzhenxing 3f49232c84 修行增加主角属性 2023-11-24 18:30:31 +08:00
wangzhenxing 8240f1e631 礼物战斗力计算修改 2023-11-24 16:32:35 +08:00
wangzhenxing f9ce476401 训练修改 2023-11-24 15:00:22 +08:00
wangzhenxing fe14155802 特训建筑修改 2023-11-24 11:46:47 +08:00
wangzhenxing db821399a1 特训建筑提交 2023-11-22 19:20:42 +08:00
wangzhenxing 87734b56ee 特训提交 2023-11-22 18:38:49 +08:00
wangzhenxing 37b4489aed 特训建筑修改 2023-11-21 18:59:58 +08:00
xiejun 5b4dbf3c92 角色特训的数据结构和uidata 2023-11-21 17:34:34 +08:00
wangzhenxing 5f191e29cb 特训提交 2023-11-21 17:26:43 +08:00
wangzhenxing d7c45359bb uidata 提交 2023-11-21 15:35:30 +08:00
xiejun b02b37beaf 归元相关代码修改 2023-11-20 17:37:43 +08:00
wangzhenxing b09b45c92e 特训数据管理类提交 2023-11-20 16:14:02 +08:00
wangzhenxing 8b59fae009 特训管理类提交 2023-11-20 10:35:47 +08:00
wangzhenxing b624bc17b5 删除无用资源 2023-11-17 19:03:40 +08:00
xiejun b356e301ac 文件 2023-11-16 19:02:31 +08:00
wangzhenxing bb9243ea25 请求界面修改 2023-11-16 15:33:54 +08:00
wangzhenxing 68efafbdfe 魂印修改 2023-11-16 11:45:30 +08:00
wangzhenxing 6db231dc8a 寻宝 灵兽详情界面修改 2023-11-15 18:16:50 +08:00
wangzhenxing 902e27918f 活动按钮修改 2023-11-15 17:19:43 +08:00
wangzhenxing 96d0a857c9 英雄信息展示界面修改 2023-11-15 16:42:13 +08:00
xiejun 0a5530667b 神将页面礼物按钮修改 2023-11-15 16:38:46 +08:00
wangzhenxing 50517e9b94 主城界面修改提交 2023-11-15 16:08:39 +08:00
wangzhenxing 6ed182d53e 【副本】=================================主线副本跳过小人跑地图的流程 2023-11-15 14:53:42 +08:00
wangzhenxing b58d68e5e7 命石界面显示小人修改 2023-11-15 14:34:20 +08:00
xiejun a9aed6cf19 修改角色界面按钮选中状态 2023-11-15 14:15:25 +08:00
wangzhenxing 4e04803971 多对塔修改 2023-11-14 18:34:01 +08:00
xiejun 07e72f4829 修改ExpeditionMonsterInfoPopup预制体 2023-11-14 17:12:24 +08:00
wangzhenxing 49cc691cbb 战斗结束打开回放按钮 2023-11-14 14:09:22 +08:00
wangzhenxing 22ec1e1baa 伤害记录界面修改提交 2023-11-14 13:50:52 +08:00
xiejun 0e67a3d189 关卡详情界面预制体修改 2023-11-13 19:06:34 +08:00
wangzhenxing 0939d80af9 角色信息界面修改 2023-11-13 18:46:25 +08:00
wangzhenxing d5ed3cf71b 战斗修改 我要变强,战斗伤害记录入口屏蔽 2023-11-13 18:28:01 +08:00
xiejun 7d4c58f026 修行界面 2023-11-13 18:05:45 +08:00
wangzhenxing bc2603a3f2 备战界面设置界面修改 2023-11-13 15:34:29 +08:00
wangzhenxing d5a8f71739 身外化身展示立绘修改 2023-11-13 14:49:17 +08:00
wangzhenxing cfe5e05df6 [战斗]=====================技能命中添加判断 2023-11-13 14:07:02 +08:00
xiejun f49e326c83 战斗的胜败,首领信息,最佳mvp等界面 2023-11-12 16:24:40 +08:00
wangzhenxing 45afafba01 排行榜备战界面修改 2023-11-11 18:05:39 +08:00
wangzhenxing 469db60439 Revert "[新手引导]=====================================屏蔽新手引导"
This reverts commit a3451e590b.
2023-11-11 18:00:19 +08:00
xiejun eb56c7ff1b 修改选择按钮的字体颜色 2023-11-11 17:38:56 +08:00
xiejun d876a69a23 十绝阵BUG修复 2023-11-11 17:27:09 +08:00
xiejun 6c95c05b6c 和之国寻宝预制体修改 2023-11-11 17:11:23 +08:00
xiejun 445bdaac11 金币经验副本的选中框和标题字体调整 2023-11-11 16:51:05 +08:00
xiejun 164e8afd3b 调整修行界面的按钮(PracticePanel) 2023-11-11 16:15:28 +08:00
wangzhenxing f580db9af8 图鉴修改提交 2023-11-11 16:13:52 +08:00
wangzhenxing 9ee7c9793f 灵兽界面修改 2023-11-11 15:42:30 +08:00
xiejun d6c57eb391 战令预制体修改 2023-11-11 15:03:03 +08:00
wangzhenxing ca6c9cc5be 【战斗】========================去除无用log 2023-11-11 11:03:37 +08:00
wangzhenxing a3451e590b [新手引导]=====================================屏蔽新手引导 2023-11-11 11:02:48 +08:00
wangzhenxing d594debd41 [战斗]=========神兵技能修改 2023-11-10 19:00:50 +08:00
wangzhenxing 1642a786a9 挂机金币按钮提交 2023-11-10 18:53:24 +08:00
wangzhenxing 81ed03a059 [战斗]===================技能效果添加空判断 2023-11-10 18:00:41 +08:00
xiejun 7cdff99432 商店UI修改 2023-11-10 17:47:26 +08:00
wangzhenxing 4a684042f4 挂机界面修改,战斗流程修改 2023-11-10 17:24:48 +08:00
xiejun 10ade04a60 角色立绘位置改为配表 2023-11-10 16:07:52 +08:00
xiejun 6e1a65aa13 修改副本怪物显示弹窗预制体 2023-11-10 15:49:20 +08:00
wangzhenxing d38fdf9717 首充预设修改提交 2023-11-10 15:35:12 +08:00
wangzhenxing 94bdb33e38 挂机界面修改 2023-11-10 14:42:52 +08:00
wangzhenxing 62d0af98c2 挂机界面提交 2023-11-10 11:48:41 +08:00
xiejun 1952ecceab 解决命石界面frame不对的问题 2023-11-09 19:06:05 +08:00
xiejun d988829154 战斗场景根据配置加载 2023-11-09 18:22:16 +08:00
wangzhenxing 477f3356d8 战斗添加空判断,结算界面修改 2023-11-09 17:29:29 +08:00
wangzhenxing 437d083f68 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-09 16:01:13 +08:00
wangzhenxing a7f2d39189 刷冲界面修改提交 2023-11-09 16:00:42 +08:00
xiejun e09a6a9c23 战斗背景替换和战斗逻辑的修改 2023-11-09 16:00:30 +08:00
wangzhenxing 31718ea87d 主界面修改升级界面修改 2023-11-09 15:35:38 +08:00
wangzhenxing 3df62f9ebf 解散界面修改 2023-11-09 11:34:01 +08:00
wangzhenxing b00f874236 点石成金修改提交 2023-11-09 10:52:24 +08:00
xiejun 1e3ef6f5a3 副本名称和战斗位置 2023-11-08 18:18:47 +08:00
xiejun 16859c0aa7 修改spine缩放不正常的bug 2023-11-08 17:43:15 +08:00
wangzhenxing 890e6b157d 充值豪礼按钮图标修改 2023-11-08 17:38:45 +08:00
wangzhenxing d9722c0f9f 活动界面显示修改 2023-11-08 16:57:26 +08:00
xiejun ba00dc1132 战斗新增修改spine动画缩放 2023-11-08 16:35:53 +08:00
wangzhenxing 8223d041f9 聊天界面修改 2023-11-08 15:52:49 +08:00
wangzhenxing 8da4412a87 主城预设 修改提交 2023-11-08 13:55:38 +08:00
xiejun 0cd03f3dc8 战斗spine播放错误bug 2023-11-07 19:05:57 +08:00
wangzhenxing 2ade93055c Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-11-07 18:14:46 +08:00
wangzhenxing 6c2a9c4a84 主城界面修改 2023-11-07 18:14:22 +08:00
xiejun dd16083da3 战斗部分修改 2023-11-07 18:08:43 +08:00
wangzhenxing 37ee1910ca 商店,主界面修改 2023-11-07 16:58:37 +08:00
wangzhenxing f335977a4b 装备详情界面修改 2023-11-07 15:56:30 +08:00
xiejun 4c382362a7 十绝阵UI 2023-11-06 17:26:18 +08:00
wangzhenxing f25e213b73 命石界面修改 2023-11-06 16:58:35 +08:00
wangzhenxing 793daedcb4 英雄列表阵容显示修改 2023-11-06 14:55:59 +08:00
wangzhenxing 220e56f8c7 英雄列表界面修改 2023-11-06 14:10:55 +08:00
xiejun e1f533f0aa 奖励预览UI 2023-11-03 19:19:21 +08:00
wangzhenxing b20e6361b2 主界面修改提交 2023-11-03 19:16:16 +08:00
wangzhenxing 0ec0ccc6b2 玩家界面修改提交 2023-11-03 18:43:17 +08:00
xiejun 9b27835185 抽卡 2023-11-03 16:45:33 +08:00
wangzhenxing 0d2638355a 主界面修改 2023-11-03 15:46:07 +08:00
wangzhenxing 2f160b4e67 挂机界面修改 2023-11-03 14:21:13 +08:00
wangzhenxing 90134677d2 急速探索界面修改提交 2023-11-03 11:42:57 +08:00
wangzhenxing 86d0aadc5d 超值连冲界面修改提交 2023-11-02 18:49:37 +08:00
wangzhenxing d972e70e05 推荐阵容修改提交 2023-11-02 18:10:22 +08:00
wangzhenxing 0167d707bf 首充修改提交 2023-11-02 17:46:09 +08:00
xiejun a45b0fbb23 点将台UI 2023-11-02 17:24:35 +08:00
wangzhenxing c67eb7f7ad 神兵系统界面修改提交 2023-11-02 16:03:11 +08:00
wangzhenxing 9a86ec8026 神兵主界面修改提交 2023-11-01 19:02:00 +08:00
xiejun f939ff8ac8 神将置换UI 2023-11-01 15:46:54 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
wangzhenxing 7d0f4225b7 七日狂欢界面修改 2023-10-31 18:36:31 +08:00
wangzhenxing 7ecd2a3bd2 送无限抽修改 2023-10-31 16:52:59 +08:00
wangzhenxing ad48afbfe9 礼物界面修改提交 2023-10-31 16:23:50 +08:00
xiejun 1e53fbc529 锻器阁 2023-10-31 15:30:06 +08:00
wangzhenxing 9d6308c909 法宝聚灵界面修改提交 2023-10-31 14:38:02 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
wangzhenxing d5334e08e4 四项心法界面修改 2023-10-30 17:11:52 +08:00
wangzhenxing ed63b42413 法宝聚灵修改提交 2023-10-30 15:27:42 +08:00
wangzhenxing 2ca32992da 装备共鸣屏蔽 2023-10-30 10:30:39 +08:00
wangzhenxing 325bdc2b2d 【战斗】======================被动355修改 2023-10-30 10:29:04 +08:00
xiejun b5fcc6e3f4 修改战斗表现代码 2023-10-28 17:55:30 +08:00
xiejun c8ffd1e928 修改位移判断 2023-10-28 17:40:31 +08:00
wangzhenxing 44f6ea0e86 抽取命石添加次数限制 2023-10-28 15:41:17 +08:00
wangzhenxing 9c1823a57b 装备抽卡修改提交 2023-10-27 20:58:24 +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 b31c93e68b 装备神应显示修改 2023-10-27 16:22:27 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +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
xiejun fafab89f48 升星冲榜UI 2023-10-26 18:44:37 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun 965fc5d494 十绝症UI 2023-10-25 18:51:09 +08:00
xiejun 6d3d4b067c 战斗编辑器BUg修复 2023-10-25 18:15:21 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
wangzhenxing 50a42471ec 删除无用预设脚本 2023-10-24 18:20:31 +08:00
wangzhenxing eb746bccfc [战斗]===================effect 160修改 2023-10-24 11:27:34 +08:00
xiejun 007f87d9dd 战斗添加判空 2023-10-23 20:21:37 +08:00
xiejun e1d0445714 修改bug,删除部分老预设 2023-10-23 17:44:09 +08:00
xiejun ee77f40d05 修改战斗BUG 2023-10-23 17:04:59 +08:00
xiejun fe4dec2a64 修改战斗位移BUG 2023-10-23 15:09:31 +08:00
xiejun 443dbba568 充值UI修改 2023-10-20 18:51:12 +08:00
wangzhenxing 3f12999263 [战斗]===========================注释无用注释 2023-10-20 18:30:02 +08:00
xiejun d45dbb9679 屏蔽两个活动按钮 2023-10-20 17:00:49 +08:00
xiejun d7762a4a00 登录界面替换UI 2023-10-19 22:51:00 +08:00
xiejun 2212a7443d 邮件和邮件内容UI 2023-10-19 21:05:35 +08:00
xiejun bfbce921a3 屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑 2023-10-19 17:42:21 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +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 ae5b5962b8 注释登录发送鸿蒙阵请求 2023-10-16 18:31:34 +08:00
wangzhenxing 152e0bcde0 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-16 17:11:50 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
xiejun bb83290058 排行榜UI 2023-10-16 16:16:02 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
wangzhenxing 546e6d4627 主城屏蔽鸿蒙阵入口,英雄属性信息去掉公会技能入口 2023-10-11 11:24:32 +08:00
xiejun ff21cd74d2 竞技场部分预制体修改 2023-10-10 18:53:44 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +08:00
wangzhenxing de562386e0 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
2023-09-28 16:01:34 +08:00
wangzhenxing 1e1fd36489 玩家信息界面修改 2023-09-28 16:00:26 +08:00
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
wangzhenxing 4ca9009932 逍遥游修改 2023-09-21 17:13:03 +08:00
xiejun b6bf5409f1 修改合并后的bug 2023-09-21 17:04:24 +08:00
wangzhenxing b0650bbb20 主角礼物显示修改 2023-09-21 16:41:59 +08:00
wangzhenxing 97fc7811be 英雄礼物显示修改 2023-09-21 15:18:13 +08:00
wangzhenxing f2e064faf3 易经宝库修改 2023-09-21 15:17:39 +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 ff5bcbced9 礼物合成显示秀嘎,添加礼物商店跳转 2023-09-20 17:40:33 +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 e37b4befbd 礼物显示修改 2023-09-20 11:52:31 +08:00
wangzhenxing f0919b9ce8 礼物红点提交 2023-09-20 11:28:57 +08:00
xiejun 5c4e04a1be 修改代码 2023-09-19 18:56:46 +08:00
wangzhenxing bb1ea1c7f8 [战斗]=======================添加主角连击逻辑 2023-09-19 18:49:29 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing e7a19ce338 灵兽升星修改
(cherry picked from commit 51003c0c8c)
2023-09-15 15:39:11 +08:00
wangzhenxing 51003c0c8c 灵兽升星修改 2023-09-15 15:15:11 +08:00
wangzhenxing b368ef5fe0 礼物修改提交 2023-09-15 14:42:17 +08:00
wangzhenxing e3a8cd725f 合并冲突提交 2023-09-15 14:24:03 +08:00
wangzhenxing 51dc91cbda [战斗]=======================效果162 提交
(cherry picked from commit 56736a3aca)
2023-09-15 14:18:14 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
wangzhenxing 56736a3aca [战斗]=======================效果162 提交 2023-09-14 16:20:43 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +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 4b34e64de7 工会开启 工会技能 2023-09-06 15:11:01 +08:00
wangzhenxing 6085b2193a 多对塔挑战修改 2023-09-06 14:43:33 +08:00
wangzhenxing db3b8d9562 【战斗】====================被动添加479 2023-09-04 18:45:16 +08:00
xiejun 363b5a3818 图鉴UI 2023-09-04 18:27:40 +08:00
wangzhenxing c889e67a43 英雄属性详情界面去除工会技能跳转 2023-09-04 16:57:01 +08:00
xiejun 731ca32f5b 修改BUG 2023-09-04 15:40:11 +08:00
xiejun 3993a248c0 修改bUG 2023-09-04 15:21:09 +08:00
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
wangzhenxing 241fda7f84 命石修改提交 2023-09-02 12:28:14 +08:00
wangzhenxing c39a4e1fcc 命石修改提交 2023-09-01 23:41:45 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
wangzhenxing f792ab4c7d 命石修改 2023-09-01 19:35:49 +08:00
wangzhenxing 1318c74f59 红点修改提交 2023-09-01 19:26:54 +08:00
wangzhenxing c9418f9821 命石奖励预设修改 2023-09-01 19:01:33 +08:00
wangzhenxing ffaab0f625 命石飘战力提交 2023-09-01 18:29:25 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 0e083205a3 命格修改提交 2023-09-01 12:34:34 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 5e1cc83b2a 命石修改提交 2023-08-31 15:20:27 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
wangzhenxing e0cd811e75 百抽活动去掉时间显示 2023-08-31 10:31:27 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun e50aa15b47 修改代码 2023-08-30 21:33:02 +08:00
xiejun f42141a40e 修改灵兽代码 2023-08-30 21:31:29 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
wangzhenxing f9774fd187 百抽活动修改提交,最多只显示七天奖励 2023-08-29 18:58:09 +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
wangzhenxing f838e2d0f2 轩辕宝镜修改 2023-08-29 15:21:53 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
wangzhenxing 4ade868f90 抽卡去掉妖精限制提示 2023-08-28 14:04:41 +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 07ffec7f1f 【合服】=============登录协议添加serverid 2023-08-22 13:59:39 +08:00
xiejun 9d3234a34b 修改BUG 2023-08-18 21:40:29 +08:00
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
wangzhenxing 4e388c1923 礼包提示修改 2023-08-17 13:44:14 +08:00
xiejun 15e6d575d0 修改战斗编辑器 2023-08-16 14:40:51 +08:00
xiejun 734cb92be9 去掉pating和spriteloader相关的代码 2023-08-16 11:55:55 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun edebfb4d63 修改bug 2023-08-16 10:49:55 +08:00
xiejun 32d5e9bb97 修改BUG 2023-08-15 20:52:29 +08:00
xiejun 5d7fcc5aec 修改bug 2023-08-15 20:25:06 +08:00
xiejun 7a898b34a6 no message 2023-08-15 19:04:16 +08:00
xiejun 58f205f22b 新图标 2023-08-15 17:03:19 +08:00
xiejun 15b598237e 修改bug 2023-08-15 15:50:24 +08:00
xiejun 49df3050d1 代码 2023-08-15 13:31:06 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
wangzhenxing 9cb8cd4b06 玩家战斗力计算提交注释 2023-08-14 16:15:07 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing 67e00f2348 神兵上阵列表显示修改提交 2023-08-10 13:50:58 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
wangzhenxing 14db632938 屏蔽宝物 树添加的属性==================战斗力不一致问题 2023-08-09 17:57:35 +08:00
wangzhenxing 8800ec962b 封神之路双队塔开启条件修改 2023-08-09 13:54:59 +08:00
wangzhenxing 971ef8c453 变身卡战斗力计算修改 2023-08-08 15:45:14 +08:00
wangzhenxing 23e7d219e7 刷冲特权满足条件修改 2023-08-07 21:20:37 +08:00
wangzhenxing 56cdd1b8d3 gm刷冲描述修改 ,特权特权激活修改 2023-08-07 20:10:34 +08:00
wangzhenxing f591f0c76e 快速挑战入口开启条件修改 2023-08-07 18:59:29 +08:00
wangzhenxing 59c75221b0 七界秘宝开启奖励显示修改 2023-08-07 15:47:14 +08:00
wangzhenxing a4e6d63433 修行对应颜色名字修改 2023-08-07 14:28:11 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing 5b88556d9a 心愿抽卡提示修改 2023-08-04 16:41:33 +08:00
wangzhenxing 9b7edc9908 聊天限制修改 2023-08-04 16:28:28 +08:00
wangzhenxing 6d82c9d02d 工会屏蔽修改工会宣言入口 2023-08-04 16:24:24 +08:00
wangzhenxing 49d7c26a39 心魔试炼快速挑战开启条件修改 2023-08-04 15:15:08 +08:00
wangzhenxing 7f0038e9c4 宝物===========红点修改提交 2023-08-03 16:16:33 +08:00
wangzhenxing 163c0eff09 神印套装技能显示修改 2023-08-03 15:23:20 +08:00
wangzhenxing 0a3f661417 主角变身卡升星升到最高星级,提升另外一个显示异常修改 2023-08-03 11:45:46 +08:00
wangzhenxing 92d9d4a413 山河设计图提示修改 2023-08-02 15:44:43 +08:00
wangzhenxing c32b71d3fc 变身卡无法升星修改,法宝超过10级显示修改 2023-08-02 14:46:18 +08:00
wangzhenxing 1fe1525b62 明望特权上面显示经验升级所需经验修改 2023-07-31 18:53:23 +08:00
wangzhenxing cda1bc9893 灵脉秘境置灰能进入问题修改 2023-07-31 17:56:30 +08:00
wangzhenxing c9bb9fabcc 聊天开启条件修改,提示修改 2023-07-31 17:43:39 +08:00
wangzhenxing a025c1b250 特殊渠道特殊礼包显示处理 2023-07-31 16:03:24 +08:00
wangzhenxing 143e47c6ee 特殊渠道特殊展示修改提交 2023-07-31 15:22:25 +08:00
wangzhenxing b3d94c4dc9 聊天发言限制修改 2023-07-31 14:50:23 +08:00
wangzhenxing 5edb051da9 心愿抽卡改回之前提示 2023-07-31 14:32:22 +08:00
wangzhenxing fbf0411174 刷冲特权价格修改 2023-07-31 14:07:26 +08:00
wangzhenxing 11fd9a1061 小7礼包特殊处理 2023-07-28 15:22:23 +08:00
wangzhenxing 6dbb9aca5d 儿童协议,分享特殊显示提交 2023-07-28 14:21:40 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
wangzhenxing 7523d9d667 明望特权等级添加默认值 2023-07-26 15:15:52 +08:00
wangzhenxing aa86f127f4 神将法宝心愿抽卡提示修改 2023-07-26 14:26:34 +08:00
wangzhenxing dff7664cab 聊天==============添加聊天限制 2023-07-26 10:31:27 +08:00
wangzhenxing 5ac2ed1220 山河设计图添加关卡提示 2023-07-24 11:31:36 +08:00
wangzhenxing d4585f2c97 【战斗】=====================被动添加470 2023-07-21 17:46:35 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
wangzhenxing 1e7aba83c2 礼包,屏蔽附赠仙晶的提示 2023-07-21 14:59:53 +08:00
wangzhenxing f298816345 寻宝激活按钮改为跳到刷冲特权界面 2023-07-20 18:48:34 +08:00
wangzhenxing a2d3393829 变身卡升级升星去除 消耗妖精显示 2023-07-20 18:39:01 +08:00
wangzhenxing 06022bf0ae 变身卡升级升星屏蔽化身之力显示
(cherry picked from commit 5855e6e1cf)
2023-07-20 18:12:41 +08:00
wangzhenxing e9e1eec1f8 屏蔽宗门红包入口显示 2023-07-20 18:05:17 +08:00
PC-202302260912\Administrator 1540c24358 推送礼包去除 showtype 33 数据 2023-07-19 19:03:15 +08:00
PC-202302260912\Administrator 1081ed5827 推送 折扣礼包==================注释删除的推送礼包 2023-07-19 18:06:01 +08:00
PC-202302260912\Administrator b6718cefca 装备心愿抽卡显示剩余必中次数 2023-07-19 15:40:15 +08:00
PC-202302260912\Administrator a40bfe0fd8 功能开启条件修改 2023-07-19 15:05:02 +08:00
PC-202302260912\Administrator 609bc6e6b1 抽卡注释小tip提示信息 2023-07-18 16:17:15 +08:00
PC-202302260912\Administrator e7084afe68 法宝==================法宝特性激活显示等级修改 2023-07-18 16:08:15 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
PC-202302260912\Administrator 65b4f5fc20 周卡活动名称修改 2023-07-17 14:48:27 +08:00
PC-202302260912\Administrator 15cce82e7a 法宝抽卡添加开启限制 2023-07-17 14:27:56 +08:00
PC-202302260912\Administrator 08e1057cf6 月卡基金50倍图片修改提交 2023-07-14 13:58:47 +08:00
PC-202302260912\Administrator eafdbd9f44 Revert "屏蔽挂机界面寻宝入口显示及红点检测"
This reverts commit 374e6d80cd.
2023-07-14 11:27:34 +08:00
PC-202302260912\Administrator 2987bc24a2 心魔试炼=================屏蔽神应显示 2023-07-14 11:24:26 +08:00
xiejun 87dfec134c 修改代码 2023-07-13 17:04:48 +08:00
PC-202302260912\Administrator 49958d7b10 背包==================屏蔽魂印,变身,聚灵按钮 2023-07-13 17:01:05 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
PC-202302260912\Administrator 1632820d89 代金券弹窗提示修改 2023-07-12 18:59:49 +08:00
PC-202302260912\Administrator 6a8cc22103 刷充特权原特权价格显示修改 2023-07-12 18:59:06 +08:00
PC-202302260912\Administrator 02a2374c53 主城=======洞府,跨服战入口屏蔽,灵兽山位置修改 2023-07-12 18:23:39 +08:00
PC-202302260912\Administrator c5bc3d8e04 超值连冲==================屏蔽 12元 30元挡位礼包 2023-07-12 15:41:52 +08:00
PC-202302260912\Administrator e3f5c7de9d 法宝心愿修改 2023-07-11 11:43:02 +08:00
PC-202302260912\Administrator de3f2d011a 心愿宝箱奖励排序修改 2023-07-10 18:56:20 +08:00
PC-202302260912\Administrator daacab6cbe 罗浮争锋显示倒计时修改 2023-07-10 18:49:38 +08:00
PC-202302260912\Administrator 22122de56a 心愿法宝抽卡入口改成开服n天后显示 2023-07-10 17:09:33 +08:00
PC-202302260912\Administrator cf6de3c6e5 身外化身属性预览界面修改 2023-07-07 17:48:19 +08:00
PC-202302260912\Administrator a72f5e0405 友情抽卡排序修改 2023-07-07 16:27:41 +08:00
PC-202302260912\Administrator 4a15931ce1 【七界试炼】======入口提示修改 2023-07-07 15:51:59 +08:00
PC-202302260912\Administrator cd209bdb76 [青龙秘宝]=================屏蔽青龙秘宝活动时间,倒计时显示 2023-07-07 14:08:39 +08:00
PC-202302260912\Administrator 32ac61db17 罗浮争锋移到竞技场,屏蔽竞技场巅峰赛 2023-07-07 13:51:34 +08:00
PC-202302260912\Administrator 8bae77bd5b [法宝]====================法宝特性描述修改 2023-07-07 10:27:42 +08:00
PC-202302260912\Administrator e56b1e3823 御兽斋=============屏蔽御兽斋入口及红点 2023-07-06 16:36:34 +08:00
PC-202302260912\Administrator 65f0eac110 法宝25级特性显示修改 2023-07-06 16:28:19 +08:00
PC-202302260912\Administrator cecf89dc70 装备招募显示修改 2023-07-06 15:48:40 +08:00
PC-202302260912\Administrator 8050e9995d 七界屏蔽排行奖励界面入口 2023-07-06 15:04:17 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
wangzhenxing 543bdb6579 =====================战斗修改及添加log 2023-07-04 17:43:52 +08:00
PC-202302260912\Administrator 122addf38f 四相心法----------------屏蔽技能按钮 2023-07-04 15:09:41 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
wangZhenXing 1bc056f23a 心愿法宝修改提交 2023-07-03 16:01:29 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
xiejun 0bb8dfbb6e 凱多的live2d 2023-06-29 15:04:58 +08:00
xiejun f52a94841e 修改战斗的代码,已经调整live2D 2023-06-28 15:58:29 +08:00
PC-202302260912\Administrator 5838089889 七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
2023-06-28 15:50:22 +08:00
PC-202302260912\Administrator 3f1ab4f07f 探索对应特权跳转修改 2023-06-28 15:28:39 +08:00
PC-202302260912\Administrator 374e6d80cd 屏蔽挂机界面寻宝入口显示及红点检测 2023-06-28 14:51:14 +08:00
PC-202302260912\Administrator 3d5ed9271e 代金券购买礼包提交 2023-06-28 14:14:34 +08:00
xiejun b47c16dcb7 test 2023-06-20 18:01:51 +08:00
PC-202302260912\Administrator 1b6b5ecdad 抽卡设置心愿修改提交 2023-06-20 17:14:48 +08:00
PC-202302260912\Administrator 71c005e068 永久特权描述显示修改 2023-06-16 14:32:50 +08:00
PC-202302260912\Administrator a6d235528f 屏蔽宗门技能 2023-06-14 18:42:21 +08:00
PC-202302260912\Administrator 6c6a7d19f7 山河社稷图提交开放章节提示 2023-06-14 18:12:47 +08:00
PC-202302260912\Administrator 795c3e52f0 心願抽卡修改提交 2023-06-13 18:46:34 +08:00
wangzhenxing b22a8d6975 新手开启新手引导 2023-06-12 14:31:23 +08:00
wangzhenxing 485ad2f433 刷冲特权修改 2023-06-07 16:36:08 +08:00
wangzhenxing cea83cf20a 战斗兼容老板剧情英雄释放技能 2023-06-07 16:26:57 +08:00
wangzhenxing 707417eb37 疯体屏蔽创角界面 2023-06-07 13:28:35 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing 3301f19f00 心愿法宝修改提交 2023-06-06 19:48:57 +08:00
wangzhenxing 20f7c9da96 名望礼包修改提交 2023-06-06 19:38:21 +08:00
wangzhenxing 2694f5ad57 礼包报错修改提交 2023-06-06 17:16:28 +08:00
wangzhenxing 14e16c3d34 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
wangzhenxing 545568fa46 月卡界面修改提交 2023-06-02 16:13:04 +08:00
wangzhenxing a9b13b206c 山河设计图添加开服时间限制 2023-06-02 16:09:28 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing 250fa4d5ee 法相升星属性修改 2023-05-31 14:20:29 +08:00
wangzhenxing 09ea7051f0 屏蔽大闹天宫,森罗幻境 2023-05-30 10:26:42 +08:00
wangzhenxing f4aeeacc4d 主城屏蔽gm修改器 2023-05-29 17:17:24 +08:00
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing a0fa68be2a 登陆界面去掉儿童协议,主角信息去掉特权等级按钮 2023-05-26 18:43:52 +08:00
wangzhenxing be76933912 Merge branch 'china/dev_bt' into china/dev_bt_develop 2023-05-17 17:00:37 +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
yuanshuai 4ece26aaf4 七界试炼输了也消耗挑战次数bug修复 2023-05-10 14:31:18 +08:00
yuanshuai d4a971e087 Merge branch 'china/dev_bt_develop' into china/dev_bt
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua
2023-05-08 17:42:35 +08:00
yuanshuai b02ebc8b22 摘星阁bug修改 2023-05-08 17:27:12 +08:00
yuanshuai 9f4109c16f 七界试炼bug修复 2023-05-08 15:00:52 +08:00
yuanshuai db1e9a9305 时空职业bug修改 2023-05-08 11:21:53 +08:00
yuanshuai 7a388d96ea Merge branch 'china/dev_bt_develop' into china/dev_bt 2023-04-27 11:35:59 +08:00
yuanshuai 4af5d91b68 宝物合成bug修改 2023-04-25 18:13:49 +08:00
wangzhenxing 075fd4ab01 鸿蒙阵下阵卸下装备修改 2023-04-24 17:34:12 +08:00
wangzhenxing 35ee3bdf48 摘星阁修改 2023-04-23 15:23:41 +08:00