xiejun
1952ecceab
解决命石界面frame不对的问题
2023-11-09 19:06:05 +08:00
xiejun
d988829154
战斗场景根据配置加载
2023-11-09 18:22:16 +08:00
PC-202302260912\Administrator
7b869484dc
魂印修改
2023-11-09 17:34:52 +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
PC-202302260912\Administrator
a0927452ca
临时图片上传
2023-11-09 15:36:54 +08:00
wangzhenxing
31718ea87d
主界面修改升级界面修改
2023-11-09 15:35:38 +08:00
wangzhenxing
3df62f9ebf
解散界面修改
2023-11-09 11:34:01 +08:00
PC-202302260912\Administrator
3c5fde5a4d
周卡相关东西
2023-11-09 11:09:19 +08:00
wangzhenxing
af424d57cf
loading7修改
2023-11-09 10:59:25 +08:00
wangzhenxing
b00f874236
点石成金修改提交
2023-11-09 10:52:24 +08:00
PC-202302260912\Administrator
ff7b956505
loading相关
2023-11-08 19:10:09 +08:00
PC-202302260912\Administrator
e05f116a8e
首冲
2023-11-08 18:36:25 +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
PC-202302260912\Administrator
26d8bab9e3
日常奖励
2023-11-08 16:17:47 +08:00
wangzhenxing
8223d041f9
聊天界面修改
2023-11-08 15:52:49 +08:00
PC-202302260912\Administrator
e9cd0629fc
修改通用页面
2023-11-08 15:03:11 +08:00
wangzhenxing
8da4412a87
主城预设 修改提交
2023-11-08 13:55:38 +08:00
PC-202302260912\Administrator
5f14e298b7
踏碎凌霄
2023-11-08 11:27:11 +08:00
PC-202302260912\Administrator
d437ad593f
变身卡升星页面修改
2023-11-07 20:23:52 +08:00
xiejun
0cd03f3dc8
战斗spine播放错误bug
2023-11-07 19:05:57 +08:00
wangzhenxing
8f4a165489
代码提交
2023-11-07 18:22:05 +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
10b4329744
Revert "聊天系统初步调整"
...
This reverts commit a4db288249 .
2023-11-07 17:11:57 +08:00
wangzhenxing
37ee1910ca
商店,主界面修改
2023-11-07 16:58:37 +08:00
PC-202302260912\Administrator
a4db288249
聊天系统初步调整
2023-11-07 16:39:55 +08:00
wangzhenxing
f335977a4b
装备详情界面修改
2023-11-07 15:56:30 +08:00
PC-202302260912\Administrator
80cdbab2b5
青雉技能
2023-11-07 13:41:44 +08:00
PC-202302260912\Administrator
98fe20b8da
服务器选择页面
2023-11-06 19:46:18 +08:00
PC-202302260912\Administrator
ede8dfb379
新功能提示修改
2023-11-06 18:59:23 +08:00
xiejun
4c382362a7
十绝阵UI
2023-11-06 17:26:18 +08:00
wangzhenxing
f25e213b73
命石界面修改
2023-11-06 16:58:35 +08:00
PC-202302260912\Administrator
9689657905
神将抽卡展示列表修改
2023-11-06 16:01:47 +08:00
PC-202302260912\Administrator
5c018c4781
修改奖池预览表头
2023-11-06 15:51:31 +08:00
PC-202302260912\Administrator
92697e036c
通用页面上传
2023-11-06 15:21:57 +08:00
wangzhenxing
793daedcb4
英雄列表阵容显示修改
2023-11-06 14:55:59 +08:00
wangzhenxing
220e56f8c7
英雄列表界面修改
2023-11-06 14:10:55 +08:00
wangzhenxing
dfb08cf018
探索统计界面修改
2023-11-06 11:20:04 +08:00
PC-202302260912\Administrator
ad605e4ee5
小兵78错误修改
2023-11-06 11:04:02 +08:00
PC-202302260912\Administrator
63c62d80f5
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-11-03 19:26:16 +08:00
PC-202302260912\Administrator
7bb9276a39
优化抽卡页面
2023-11-03 19:19:38 +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
PC-202302260912\Administrator
42c6da7293
优化境界预览
2023-11-03 18:18:14 +08:00
PC-202302260912\Administrator
8d00feb410
微调
2023-11-03 18:10:46 +08:00
xiejun
531b7b9d9d
单次抽奖的预制体
2023-11-03 18:02:49 +08:00
PC-202302260912\Administrator
449914982d
优化日常任务
2023-11-03 17:58:56 +08:00
PC-202302260912\Administrator
fb1855b590
修改境界预览
2023-11-03 17:57:54 +08:00
PC-202302260912\Administrator
f067eaaff6
七日狂欢微调
2023-11-03 16:50:23 +08:00
xiejun
7318de05d2
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-11-03 16:46:07 +08:00
xiejun
9b27835185
抽卡
2023-11-03 16:45:33 +08:00
PC-202302260912\Administrator
bd14ba8b41
优化首充页面
2023-11-03 16:38:45 +08:00
wangzhenxing
0d2638355a
主界面修改
2023-11-03 15:46:07 +08:00
PC-202302260912\Administrator
8015168fbc
心愿奖励
2023-11-03 15:39:29 +08:00
wangzhenxing
2f160b4e67
挂机界面修改
2023-11-03 14:21:13 +08:00
wangzhenxing
90134677d2
急速探索界面修改提交
2023-11-03 11:42:57 +08:00
PC-202302260912\Administrator
3f6e823337
通用图标上传
2023-11-03 10:52:32 +08:00
PC-202302260912\Administrator
e3e24353ef
神将
2023-11-02 19:22:51 +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
PC-202302260912\Administrator
192e92416e
在线奖励相关
2023-11-02 16:58:30 +08:00
wangzhenxing
c67eb7f7ad
神兵系统界面修改提交
2023-11-02 16:03:11 +08:00
PC-202302260912\Administrator
7c0cf86935
首充相关
2023-11-01 19:08:54 +08:00
wangzhenxing
9a86ec8026
神兵主界面修改提交
2023-11-01 19:02:00 +08:00
PC-202302260912\Administrator
a87bca727c
限时折扣
2023-11-01 17:29:04 +08:00
xiejun
f9bf9b27be
修改预制体
2023-11-01 17:19:09 +08:00
PC-202302260912\Administrator
fc66533d1a
阵营推荐
2023-11-01 16:27:05 +08:00
wangzhenxing
730966a6df
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-11-01 15:47:46 +08:00
wangzhenxing
dbac53d14d
属性信息界面,技能信息界面修改
2023-11-01 15:47:17 +08:00
xiejun
f939ff8ac8
神将置换UI
2023-11-01 15:46:54 +08:00
PC-202302260912\Administrator
121a97c801
添加按钮
2023-11-01 15:24:32 +08:00
wangzhenxing
08fea279e1
化身卡修改提交
2023-11-01 15:11:41 +08:00
PC-202302260912\Administrator
d4779c6a3d
超级特权相关
2023-11-01 14:39:15 +08:00
PC-202302260912\Administrator
aa81773fb0
主界面图标
2023-11-01 10:47:24 +08:00
PC-202302260912\Administrator
a4e942f285
修改限时兑换
2023-10-31 19:42:01 +08:00
PC-202302260912\Administrator
442e99da6d
限时兑换
2023-10-31 18:55:40 +08:00
wangzhenxing
7d0f4225b7
七日狂欢界面修改
2023-10-31 18:36:31 +08:00
wangzhenxing
6f771c23cb
月卡 开服狂欢界面修改
2023-10-31 17:25:27 +08:00
PC-202302260912\Administrator
fd4f2f833e
七日登录
2023-10-31 17:14:03 +08:00
PC-202302260912\Administrator
90eab3e98d
7日登陆
2023-10-31 17:00:08 +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
PC-202302260912\Administrator
b15c4f942e
礼物相关
2023-10-31 11:43:32 +08:00
wangzhenxing
55aa1ed967
英雄spine预设位置修改
2023-10-31 10:51:14 +08:00
PC-202302260912\Administrator
c11ad012de
四象心法优化
2023-10-30 20:28:39 +08:00
wangzhenxing
d1a9cff2c5
法宝聚灵修改提交
2023-10-30 19:16:17 +08:00
wangzhenxing
d5334e08e4
四项心法界面修改
2023-10-30 17:11:52 +08:00
PC-202302260912\Administrator
ae6fe98e10
四象心法
2023-10-30 16:34:27 +08:00
PC-202302260912\Administrator
7088098c1a
四象心法修改
2023-10-30 16:29:58 +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
PC-202302260912\Administrator
f4012ea61e
红点位置修改
2023-11-06 17:17:32 +08:00
PC-202302260912\Administrator
24183b728a
等级背景框修正
2023-10-28 16:26:55 +08:00
PC-202302260912\Administrator
21d8e1ee5b
添加日常任务缺少的图片
2023-10-28 16:08:31 +08:00
PC-202302260912\Administrator
b245afd6a6
修正天宫
2023-10-28 15:55:08 +08:00
wangzhenxing
0406690f56
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-10-28 15:41:33 +08:00
wangzhenxing
44f6ea0e86
抽取命石添加次数限制
2023-10-28 15:41:17 +08:00
PC-202302260912\Administrator
aeb72a1f7b
天宫寻宝
2023-10-28 15:41:04 +08:00
wangzhenxing
9c1823a57b
装备抽卡修改提交
2023-10-27 20:58:24 +08:00
xiejun
cd9a898c46
神将天赋字号颜色
2023-10-27 20:48:34 +08:00
xiejun
44e3f87d2c
背包资源
2023-10-27 18:50:54 +08:00
xiejun
1c56d6629d
修改公会,和恭喜获得的UI
2023-10-27 17:39:09 +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
PC-202302260912\Administrator
7965174646
公告
2023-10-27 13:27:39 +08:00
PC-202302260912\Administrator
ba397d1aaf
添加
2023-10-27 11:11:38 +08:00
wangzhenxing
2134fa658d
法宝添加开启条件,抽卡显示修改
2023-10-27 10:57:03 +08:00
PC-202302260912\Administrator
0a795ac484
小兵15技能
2023-10-26 20:59:00 +08:00
wangzhenxing
9a1646ec48
法宝升级显示修改
2023-10-26 20:54:06 +08:00
wangzhenxing
ed4865cc3c
法宝星级显示修改
2023-10-26 20:44:18 +08:00
xiejun
f55839e351
预制体修改
2023-10-26 18:52:51 +08:00
xiejun
805179cc81
升星冲榜补充
2023-10-26 18:50:39 +08:00
xiejun
fafab89f48
升星冲榜UI
2023-10-26 18:44:37 +08:00
wangzhenxing
3b64b3db82
法宝强化界面修改
2023-10-26 18:33:53 +08:00
wangzhenxing
0d08ea1a84
法灵提交
2023-10-26 17:16:10 +08:00
xiejun
d9d842c5be
恭喜获得
2023-10-26 14:54:18 +08:00
xiejun
965fc5d494
十绝症UI
2023-10-25 18:51:09 +08:00
wangzhenxing
a41aacf703
法灵强化界面预设提交
2023-10-25 18:39:36 +08:00
xiejun
6d3d4b067c
战斗编辑器BUg修复
2023-10-25 18:15:21 +08:00
PC-202302260912\Administrator
c70d1b7700
无限送抽
2023-10-25 16:56:39 +08:00
PC-202302260912\Administrator
84581526be
预制体修改
2023-10-25 16:12:49 +08:00
PC-202302260912\Administrator
fe702e50c4
天宫寻宝
2023-10-25 16:06:27 +08:00
xiejun
663fbca133
神兵热榜
2023-10-24 20:02:38 +08:00
wangzhenxing
50a42471ec
删除无用预设脚本
2023-10-24 18:20:31 +08:00
xiejun
a82fdafe48
回滚底部按钮
2023-10-24 13:36:37 +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
100980e98b
删除老预制体
2023-10-23 17:51:23 +08:00
xiejun
7776aaa3c3
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-10-23 17:44:38 +08:00
xiejun
e1d0445714
修改bug,删除部分老预设
2023-10-23 17:44:09 +08:00
wangzhenxing
15d0b82789
删除太初行无用静态立绘
2023-10-23 17:35:21 +08:00
xiejun
ee77f40d05
修改战斗BUG
2023-10-23 17:04:59 +08:00
PC-202302260912\Administrator
5123edd3ec
弗兰奇技能
2023-10-23 16:44:31 +08:00
wangzhenxing
165dddce83
删除无用spine
2023-10-23 16:16:35 +08:00
wangzhenxing
45d4559857
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-10-23 15:13:36 +08:00
wangzhenxing
5276acc88d
删除部分无用英雄spine
2023-10-23 15:13:31 +08:00
xiejun
fe4dec2a64
修改战斗位移BUG
2023-10-23 15:09:31 +08:00
wangzhenxing
baaa2e20bf
删除部分太初行英雄spine
2023-10-23 14:51:24 +08:00
wangzhenxing
cd2fa20510
删除太初行部分英雄spine
2023-10-23 14:05:12 +08:00
xiejun
443dbba568
充值UI修改
2023-10-20 18:51:12 +08:00
wangzhenxing
3f12999263
[战斗]===========================注释无用注释
2023-10-20 18:30:02 +08:00
PC-202302260912\Administrator
98168f92a1
成就相关
2023-10-20 17:18:23 +08:00
xiejun
d45dbb9679
屏蔽两个活动按钮
2023-10-20 17:00:49 +08:00
PC-202302260912\Administrator
8006a761aa
信息界面调整
2023-10-20 15:22:34 +08:00
PC-202302260912\Administrator
b487194cd8
上传信息图片
2023-10-20 15:18:31 +08:00
PC-202302260912\Administrator
99d70ca52d
月卡换底
2023-10-20 13:24:17 +08:00
PC-202302260912\Administrator
788392feca
超值连充半成品
2023-10-20 11:34:23 +08:00
xiejun
d7762a4a00
登录界面替换UI
2023-10-19 22:51:00 +08:00
PC-202302260912\Administrator
34ba7a787d
月卡相关
2023-10-19 22:43:48 +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
432fc640f3
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-10-18 20:45:10 +08:00
xiejun
077b82bd84
好友,公会副本等UI修改
2023-10-18 20:41:04 +08:00
wangzhenxing
b7949c7e91
法灵信息界面提交
2023-10-18 17:28:34 +08:00
wangzhenxing
64d5426397
装备=============套装属性 技能显示修改
2023-10-17 15:47:10 +08:00
PC-202302260912\Administrator
70a04e965a
布鲁克相关
2023-10-17 15:33:44 +08:00
PC-202302260912\Administrator
e54b9f5f58
图片和布鲁克相关
2023-10-17 14:33:47 +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
PC-202302260912\Administrator
cc3d25fcd3
图片修改
2023-10-19 17:15:02 +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
PC-202302260912\Administrator
f39a4b6c20
资源上传
2023-10-19 11:53:27 +08:00
wangzhenxing
e3867bc3d7
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-10-14 12:20:29 +08:00
wangzhenxing
5f4494a306
潜能常量提交
2023-10-14 12:05:20 +08:00
PC-202302260912\Administrator
8f9d608240
8个模型
2023-10-13 11:50:50 +08:00
xiejun
f9adc3d4a7
排行榜和修复BUG
2023-10-13 11:24:19 +08:00
PC-202302260912\Administrator
6c6ce67bc3
第二波
2023-10-12 17:52:18 +08:00
PC-202302260912\Administrator
54837f83b2
模型上传第一波
2023-10-12 17:49:35 +08:00
PC-202302260912\Administrator
975da0144f
小兵1相关
2023-10-11 14:42:47 +08:00
wangzhenxing
546e6d4627
主城屏蔽鸿蒙阵入口,英雄属性信息去掉公会技能入口
2023-10-11 11:24:32 +08:00
xiejun
ff21cd74d2
竞技场部分预制体修改
2023-10-10 18:53:44 +08:00
wangzhenxing
fff8911f19
英雄信息界面预设修改
2023-10-10 10:29:23 +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
PC-202302260912\Administrator
7691b7913b
乌索普相关
2023-09-22 13:22:22 +08:00
wangzhenxing
db71c4df20
神将主界面修改
2023-09-21 18:58:21 +08:00
wangzhenxing
40b132d6be
场景修改提交
2023-09-21 18:45:34 +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
d53329f6fb
灵兽部分UI
2023-09-21 18:36:44 +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
76c7acf061
礼物item显示修改
2023-09-21 15:36:17 +08:00
wangzhenxing
97fc7811be
英雄礼物显示修改
2023-09-21 15:18:13 +08:00
wangzhenxing
f2e064faf3
易经宝库修改
2023-09-21 15:17:39 +08:00
wangzhenxing
083305249a
银条添加加号
2023-09-20 19:02:41 +08:00
xiejun
253e73f8a4
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-09-20 18:58:27 +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
PC-202302260912\Administrator
0ca224a599
乌索普添加
2023-09-20 18:06:04 +08:00
xiejun
88740201b3
排行榜UI
2023-09-20 18:00:40 +08:00
wangzhenxing
ff5bcbced9
礼物合成显示秀嘎,添加礼物商店跳转
2023-09-20 17:40:33 +08:00
PC-202302260912\Administrator
2ffaa9e7d5
银锭旋转
2023-09-20 17:17:36 +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
551579ca39
星际显示添加空判断
...
(cherry picked from commit fd5cd6836c )
2023-09-15 18:02:50 +08:00
wangzhenxing
fd5cd6836c
星际显示添加空判断
2023-09-15 18:00:39 +08:00
wangzhenxing
e7a19ce338
灵兽升星修改
...
(cherry picked from commit 51003c0c8c )
2023-09-15 15:39:11 +08:00
wangzhenxing
c037d9a2a2
玩家信息预设修改
...
(cherry picked from commit a6c2a99bbb )
2023-09-15 15:38:55 +08:00
wangzhenxing
51003c0c8c
灵兽升星修改
2023-09-15 15:15:11 +08:00
wangzhenxing
a6c2a99bbb
玩家信息预设修改
2023-09-15 14:58:13 +08:00
wangzhenxing
b368ef5fe0
礼物修改提交
2023-09-15 14:42:17 +08:00
wangzhenxing
e3a8cd725f
合并冲突提交
2023-09-15 14:24:03 +08:00
wangzhenxing
14ce1fedbd
时空神将推荐阵容显示修改提交
...
(cherry picked from commit 883f9af02e )
2023-09-15 14:18:47 +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
883f9af02e
时空神将推荐阵容显示修改提交
2023-09-14 16:21:33 +08:00
wangzhenxing
56736a3aca
[战斗]=======================效果162 提交
2023-09-14 16:20:43 +08:00
PC-202302260912\Administrator
dca95dff13
修改页面布局
2023-09-13 16:38:07 +08:00
wangzhenxing
e80056fcd4
查看礼物信息提交
2023-09-13 15:44:06 +08:00
wangzhenxing
eeb3859f72
礼物功能提交
2023-09-13 14:57:48 +08:00
PC-202302260912\Administrator
739e495a60
罗杰相关
2023-09-12 16:19:20 +08:00
PC-202302260912\Administrator
d6aa6d2c90
添加模型
2023-09-12 14:35:12 +08:00
PC-202302260912\Administrator
72f8c9a5c7
漏一个
2023-09-12 14:22:03 +08:00
PC-202302260912\Administrator
68de6e2686
上传模型相关
2023-09-12 14:20:46 +08:00
PC-202302260912\Administrator
7ac17afab4
上传
2023-09-12 14:18:19 +08:00
PC-202302260912\Administrator
1811bde7d9
乌尔基
2023-09-12 14:16:26 +08:00
PC-202302260912\Administrator
ce772773cc
上传模型
2023-09-12 14:12:31 +08:00
xiejun
ccb0cd4838
修改混乱之后角色不行动的BUG
2023-09-11 17:59:32 +08:00
PC-202302260912\Administrator
b7c638b8b7
图标修改
2023-09-08 17:26:39 +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
fdae5c1348
嘲讽图标修改
2023-09-06 10:31:10 +08:00
wangzhenxing
5314b7ccf6
添加嘲讽图标
2023-09-05 20:59:52 +08:00
wangzhenxing
db98c5dd91
Merge branch 'dev_oneDis' of http://192.168.1.21:3000/root/miduo_client into dev_oneDis
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2023-09-05 15:04:26 +08:00
PC-202302260912\Administrator
99bf06bd3b
魂印狂欢图标
2023-09-07 14:51:19 +08:00
wangzhenxing
2a5188a8fc
协议提交
2023-09-05 14:55:38 +08:00
PC-202302260912\Administrator
253858dfba
黄猿图片
2023-09-04 21:39:41 +08:00
PC-202302260912\Administrator
d2f39af497
阿龙上传
2023-09-04 20:10:53 +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
PC-202302260912\Administrator
fcf92fcc50
添加动作
2023-09-04 14:51:27 +08:00
PC-202302260912\Administrator
d73b462e1d
上传美术资源
2023-09-04 14:00:24 +08:00
PC-202302260912\Administrator
4bfa80709f
修正头像
2023-09-02 19:17:32 +08:00
xiejun
87bd10593d
工会
2023-09-02 18:59:49 +08:00
xiejun
3ab79a59b7
副本UI
2023-09-02 18:53:21 +08:00
xiejun
c6d6e21e57
修改
2023-09-02 18:04:06 +08:00
xiejun
0a3533dbfe
挑战副本
2023-09-02 17:17:15 +08:00
xiejun
5b8ef487f7
御灵
2023-09-02 17:16:34 +08:00
PC-202302260912\Administrator
f4e90a59c4
新增图片
2023-09-02 16:12: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
PC-202302260912\Administrator
83eea07584
牛气冲天图片修正
2023-09-04 19:03:24 +08:00
wangzhenxing
c9418f9821
命石奖励预设修改
2023-09-01 19:01:33 +08:00
wangzhenxing
3ac8d1ee2c
魂印图鉴修改提交
2023-09-01 18:48:59 +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
PC-202302260912\Administrator
24933b853c
修改头像
2023-08-31 21:51:08 +08:00
wangzhenxing
18e10b4fb6
命格修改提交
2023-08-31 19:12:02 +08:00
wangzhenxing
5e1cc83b2a
命石修改提交
2023-08-31 15:20:27 +08:00