JieLing
|
15099f1e09
|
【修复】寻宝界面显示错误
|
2020-12-30 14:26:37 +08:00 |
jiaoyangna
|
186906ed2c
|
灵兽宝阁假战斗id修改为读GlobalActivity表的ExpertDec 这一列
|
2020-12-30 11:21:13 +08:00 |
jiaoyangna
|
0e8811df2b
|
【优化】背包中使用多个道具,明确标注数量
|
2020-12-30 11:02:44 +08:00 |
jiaoyangna
|
2e6cdb5014
|
【优化】背包中使用多个道具,明确标注数量
|
2020-12-30 10:34:06 +08:00 |
gaoxin
|
5c69617c48
|
【优化】ui管理删除多余的层级管理
|
2020-12-29 20:46:03 +08:00 |
gaoxin
|
816351d73e
|
【优化】网络层优化-峰哥
|
2020-12-29 20:45:56 +08:00 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
guowei
|
ca9a6a933b
|
【鸿蒙阵修改】
|
2020-12-29 20:36:37 +08:00 |
gaoxin
|
962c41e11c
|
【优化】scrollview改为分帧加载
|
2020-12-29 20:35:28 +08:00 |
zhangqiang
|
c79285e4ca
|
【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev
|
2020-12-29 17:36:01 +08:00 |
zhangqiang
|
739f390115
|
Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
|
2020-12-29 17:00:08 +08:00 |
zhangqiang
|
1227e93456
|
【寻宝】 优化 加锁 1
|
2020-12-29 16:56:18 +08:00 |
zhangqiang
|
35f211a2a4
|
【工会技能】 优化 连续升级
|
2020-12-29 16:15:11 +08:00 |
JieLing
|
650de3dc74
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-29 15:57:39 +08:00 |
ZhangBiao
|
c84656e705
|
【降妖夺宝】取消抽卡前摇
|
2020-12-29 14:51:30 +08:00 |
ZhangBiao
|
99d574ba27
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-29 14:24:55 +08:00 |
ZhangBiao
|
73aeaf3d89
|
【抽卡提示】六个抽卡分别加上妖晶提示
|
2020-12-29 14:24:45 +08:00 |
jiaoyangna
|
1cf3f17888
|
【优化】神将解锁锁定状态基本看不出来,让其更加明显
|
2020-12-29 14:23:53 +08:00 |
zhangqiang
|
2576c5bcdd
|
【新将来袭】banner 图片替换
|
2020-12-29 12:13:29 +08:00 |
jiaoyangna
|
fffb834f8a
|
【优化】挂机宝箱显示当前的挂机时间
|
2020-12-29 11:26:34 +08:00 |
ZhangBiao
|
5137e588dc
|
Revert "【关卡界面】怎加挂机时间"
This reverts commit 136b2a4c18.
|
2020-12-29 10:53:48 +08:00 |
jiaoyangna
|
fa46595132
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-29 10:35:35 +08:00 |
jiaoyangna
|
d389cb93f5
|
【优化】背包分类优化
|
2020-12-29 10:33:45 +08:00 |
ZhangBiao
|
927aa7053b
|
.进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示)
|
2020-12-29 10:28:10 +08:00 |
ZhangBiao
|
574a0da116
|
【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复
|
2020-12-29 10:24:50 +08:00 |
jiaoyangna
|
19d984a641
|
【优化】背包分类优化
|
2020-12-28 21:08:25 +08:00 |
jiaoyangna
|
eba0a867da
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 20:10:50 +08:00 |
jiaoyangna
|
a8bcdf14f4
|
【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少)
|
2020-12-28 20:10:45 +08:00 |
JieLing
|
7ee7fc42d7
|
【资源修改】
|
2020-12-28 20:05:15 +08:00 |
JieLing
|
d86c2dc822
|
【资源修改】
|
2020-12-28 20:04:59 +08:00 |
guowei
|
4939dd69b8
|
【鸿蒙阵修改】
|
2020-12-28 20:02:36 +08:00 |
JieLing
|
d4862c1064
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-28 19:49:46 +08:00 |
ZhangBiao
|
136b2a4c18
|
【关卡界面】怎加挂机时间
|
2020-12-28 19:46:50 +08:00 |
zhangqiang
|
f2ac961e39
|
【提交】
|
2020-12-28 19:46:44 +08:00 |
zhangqiang
|
66e2b0b25d
|
【新将来袭】资源引用丢失
|
2020-12-28 19:41:17 +08:00 |
JieLing
|
91cfcb8ccd
|
【资源文件夹】
|
2020-12-28 19:28:05 +08:00 |
JieLing
|
f799c5432c
|
【资源调整】2
|
2020-12-28 18:59:53 +08:00 |
zhangqiang
|
bbddb9e2ec
|
【资源调整】
|
2020-12-28 18:25:51 +08:00 |
ZhangBiao
|
9f3560471c
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 17:07:30 +08:00 |
ZhangBiao
|
56436bb4c3
|
【云梦祈福】1080*2460,重置按钮点击没反应 修改
|
2020-12-28 17:06:59 +08:00 |
jiaoyangna
|
2e3ac84814
|
【优化】背包中使用多个道具,明确标注数量
|
2020-12-28 16:40:32 +08:00 |
jiaoyangna
|
58111d30a2
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 16:26:50 +08:00 |
jiaoyangna
|
02ac474504
|
【优化】背包分类优化
|
2020-12-28 16:26:38 +08:00 |
jiaoyangna
|
d85bd9c3aa
|
【优化】背包分类优化
|
2020-12-28 16:25:38 +08:00 |
ZhangBiao
|
48e05b927d
|
【装备出售】装备出售数量可以无限叠加和叠减,修改
|
2020-12-28 16:14:46 +08:00 |
ZhangBiao
|
5a9ba48166
|
【限时折扣】错字 修改
|
2020-12-28 15:59:31 +08:00 |
zhangqiang
|
680d112657
|
【乾坤宝盒】 修改
|
2020-12-28 15:56:33 +08:00 |
ZhangBiao
|
becdc2dd88
|
【抽卡优化】连续十连或单抽也有确认提示
|
2020-12-28 15:46:22 +08:00 |
ZhangBiao
|
f7804d531a
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 15:19:56 +08:00 |
ZhangBiao
|
c649621d85
|
【森罗幻境】下方头像顺序,后端把顺序换了
|
2020-12-28 15:19:46 +08:00 |
zhangqiang
|
9ecbe3b76d
|
【工会技能】 优化 把输出页签提前
|
2020-12-28 15:09:56 +08:00 |
guowei
|
3b3467d94b
|
【鸿蒙阵修改】
|
2020-12-28 14:33:30 +08:00 |
zhangqiang
|
f553b7275d
|
【跨服天梯】世界等级 加空推送协议
|
2020-12-28 14:27:52 +08:00 |
guowei
|
d55b0d58e9
|
【鸿蒙阵bug 修改】
|
2020-12-28 14:12:17 +08:00 |
zhangqiang
|
7729c433e7
|
【跨服天梯】加一个空推送
|
2020-12-28 13:56:06 +08:00 |
zhangqiang
|
46d090b509
|
【抽卡横线】去掉
|
2020-12-28 13:54:34 +08:00 |
guowei
|
d989aa5b85
|
【鸿蒙阵bug修改】
|
2020-12-28 13:37:30 +08:00 |
ZhangBiao
|
db910c2706
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 11:59:47 +08:00 |
ZhangBiao
|
b6037a00e3
|
【森罗幻境】奖励红点修改
|
2020-12-28 11:59:27 +08:00 |
jiaoyangna
|
9fc20a2663
|
Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
|
2020-12-28 11:53:29 +08:00 |
jiaoyangna
|
82f3aff140
|
限时召唤报错修改
|
2020-12-28 11:53:07 +08:00 |
ZhangBiao
|
8a23b4da2d
|
【礼包购买】礼包购买刷新,小于1分钟时显示1分钟
|
2020-12-28 11:49:14 +08:00 |
ZhangBiao
|
263e5cd0f6
|
【森罗幻境】遇怪弹出的详情底部,猎妖师->神将 修改
|
2020-12-28 11:34:35 +08:00 |
ZhangBiao
|
95436e5710
|
【抽卡】没有动画 修改
|
2020-12-28 11:31:28 +08:00 |
wangzhenxing
|
4571f9e5a5
|
[战斗] 不灭buff更新修改提交
|
2020-12-28 12:11:03 +09:00 |
ZhangBiao
|
4010991f0d
|
【森罗幻境】奖励红点修改
(cherry picked from commit b6037a00e3)
(cherry picked from commit c2b399aa43e39dfd58a624ee27531ddbecbd4828)
|
2020-12-28 12:00:36 +08:00 |
ZhangBiao
|
f35e941cf3
|
【抽卡】没有动画 修改
(cherry picked from commit 95436e5710)
(cherry picked from commit 1297c9cb18cc57626bd143a351bedc2fbc2c401d)
|
2020-12-28 11:50:59 +08:00 |
ZhangBiao
|
9d3b560c50
|
【主题活动】点击页签打开,第一个活动不是选中状态
|
2020-12-28 10:56:02 +08:00 |
gaoxin
|
2c6da4aaf0
|
【装备】装备出售界面文字显示修改
|
2020-12-28 10:46:26 +08:00 |
gaoxin
|
ab7a389f6e
|
【装备】装备出售界面文字显示修改
|
2020-12-28 10:46:18 +08:00 |
guowei
|
b406886f91
|
【鸿蒙阵bug修改】
|
2020-12-28 10:44:31 +08:00 |
jiaoyangna
|
0d40e26a34
|
副本红点修改
|
2020-12-28 10:03:24 +08:00 |
wangzhenxing
|
10156d63e6
|
【特效】混乱特效,删除冗余资源
|
2020-12-26 21:06:57 +08:00 |
ZhangBiao
|
5b22a0f671
|
【特效】混乱特效添加
|
2020-12-26 21:04:02 +08:00 |
ZhangBiao
|
9d0c6a30c2
|
【特效】混乱特效添加
|
2020-12-26 21:03:21 +08:00 |
gaoxin
|
f2715c77bc
|
【特效】混乱特效资源文件缺失补齐
|
2020-12-26 20:39:31 +08:00 |
gaoxin
|
f29b6518fa
|
【协议】误删恢复
|
2020-12-26 20:27:54 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
gaoxin
|
9e67dcb248
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-26 19:57:14 +08:00 |
gaoxin
|
f043773668
|
【资源】遗漏资源补齐
|
2020-12-26 19:56:59 +08:00 |
wangzhenxing
|
ed9efaf4e8
|
【战斗】 白骨精追加普攻必定暴击修改
|
2020-12-26 19:54:46 +09:00 |
wangzhenxing
|
fcc8724fca
|
【战斗】=====292被动位置修改
|
2020-12-26 19:52:51 +09:00 |
wangzhenxing
|
4bc92b8b21
|
[战斗]白骨精法宝添加普攻不触发任何特性
|
2020-12-26 19:49:45 +09:00 |
wangzhenxing
|
e9c4cab292
|
[战斗]289被动修改,协议数据提交
|
2020-12-26 19:48:59 +09:00 |
wangzhenxing
|
8503667fc8
|
【战斗】==========混乱特效名称修改
|
2020-12-26 19:48:06 +09:00 |
wangzhenxing
|
f07b8a14d2
|
[战斗]修改切磋判断胜负条件
|
2020-12-26 19:46:18 +09:00 |
wangzhenxing
|
96f31b63ad
|
[优化]魂宝灵宝加号点击区域扩大
|
2020-12-26 19:45:44 +09:00 |
wangzhenxing
|
e4596beb99
|
【宝物】==========宝物添加加号提示
|
2020-12-26 19:44:48 +09:00 |
wangzhenxing
|
8ad04c122c
|
[优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗
|
2020-12-26 19:36:11 +09:00 |
wangzhenxing
|
f0c2913433
|
[战斗] 修改初始怒气无法增加修改
|
2020-12-26 19:29:44 +09:00 |
wangzhenxing
|
064e00c029
|
[战斗]白骨精技能,被动,魂印效果提交
|
2020-12-26 19:28:29 +09:00 |
jiaoyangna
|
f0f423bbd4
|
红点报错 修改
|
2020-12-26 18:40:28 +08:00 |
jiaoyangna
|
c1f87eb208
|
逍遥红点 提交
|
2020-12-26 18:39:47 +08:00 |
gaoxin
|
1171415e74
|
【技能Tip】修复大小不能自适应文字的问题
|
2020-12-26 18:34:08 +08:00 |
gaoxin
|
7fe3b4f39f
|
【战斗】魂印力战之躯不再免疫间接伤害
|
2020-12-26 18:34:02 +08:00 |
gaoxin
|
f548b3647a
|
【特效】金乌特效动画文件修改
|
2020-12-26 18:33:46 +08:00 |
gaoxin
|
741f7d0448
|
【特效】修复白骨精特效全屏显示
|
2020-12-26 18:33:11 +08:00 |
gaoxin
|
bf4fbffe3d
|
【幸运探宝】修复奖池奖励显示错误
|
2020-12-26 18:33:04 +08:00 |
gaoxin
|
f4b682db17
|
【资源】增加活动及系统需求图片资源 meta文件提交
|
2020-12-26 18:32:56 +08:00 |
liuyipeng
|
56ffc108b1
|
增加活动及系统需求图片资源
|
2020-12-26 18:32:14 +08:00 |
liuyipeng
|
715670308f
|
替换白骨精法宝图片
|
2020-12-26 18:30:54 +08:00 |
gaoxin
|
104505622a
|
Merge branch 'gx/xma_local' into master_xma_local
|
2020-12-26 18:28:21 +08:00 |
zhangqiang
|
a90dc5ff6b
|
【抽卡修改】提交
|
2020-12-26 17:20:38 +08:00 |
guowei
|
9b9f006d8a
|
【鸿蒙阵修改】
|
2020-12-26 15:58:03 +08:00 |
guowei
|
d36276eb0c
|
【鸿蒙阵修改】
|
2020-12-26 15:07:51 +08:00 |
zhangqiang
|
26778992fa
|
【资源导入】 buff图标 和 状态字混乱
|
2020-12-26 11:57:58 +08:00 |
jiaoyangna
|
d5d30fd6a8
|
刷新礼包修改
|
2020-12-26 11:47:16 +08:00 |
guowei
|
381ec41882
|
【鸿蒙阵需求修改】
|
2020-12-25 18:44:13 +08:00 |
gaoxin
|
aaf7a4f470
|
【引导】修复会部分功能重复开启会重复引导的问题
|
2020-12-25 15:34:38 +08:00 |
guowei
|
5eb853efbd
|
【鸿蒙阵bug修改】
|
2020-12-25 15:33:12 +08:00 |
ZhangBiao
|
6945cbcacf
|
【森罗幻境】红点修改
|
2020-12-25 12:05:23 +08:00 |
guowei
|
f652a13697
|
【12.25 鸿蒙阵】
|
2020-12-25 10:19:02 +08:00 |
ZhangBiao
|
6befa383c8
|
【降妖夺宝】界面调整
|
2020-12-24 18:36:38 +08:00 |
ZhangBiao
|
49dc0f172c
|
【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9)
|
2020-12-24 18:01:11 +08:00 |
ZhangBiao
|
3516c10cc6
|
[森罗环境] 扎小怪计入击杀奖励
|
2020-12-24 17:16:33 +08:00 |
ZhangBiao
|
601eefb120
|
【降妖夺宝】点击抽卡时可以切换其他界面修复
|
2020-12-24 16:57:39 +08:00 |
zhangqiang
|
95c753a70e
|
【大闹天宫】上阵纯治疗神将,战斗失败后选择保留状态,报错
|
2020-12-24 16:52:46 +08:00 |
jiaoyangna
|
cb5e374ebf
|
冲突提交
|
2020-12-24 16:49:53 +08:00 |
jiaoyangna
|
a6a596746d
|
Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
|
2020-12-24 16:46:48 +08:00 |
jiaoyangna
|
6e96218bc3
|
逍遥 红点
|
2020-12-24 16:45:36 +08:00 |
jiaoyangna
|
4fea51e35f
|
逍遥红点
|
2020-12-24 16:45:13 +08:00 |
ZhangBiao
|
c5022043fd
|
【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f)
|
2020-12-24 16:43:37 +08:00 |
ZhangBiao
|
28a3341fa1
|
【增加跳转】化灵符跳转零售特惠
(cherry picked from commit bc582d93e0)
|
2020-12-24 16:43:22 +08:00 |
ZhangBiao
|
4faa39ab2a
|
【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470)
|
2020-12-24 16:42:24 +08:00 |
guowei
|
a4d332e708
|
【鸿蒙阵】
|
2020-12-24 16:34:12 +08:00 |
jiaoyangna
|
1f05f5f8f6
|
逍遥游 红点提交
|
2020-12-24 16:19:46 +08:00 |
jiaoyangna
|
e95ae4724b
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 16:19:32 +08:00 |
jiaoyangna
|
29c5c08ea4
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 16:19:22 +08:00 |
guowei
|
b09bf01c54
|
【鸿蒙阵bug修改】
|
2020-12-24 16:16:53 +08:00 |
zhangqiang
|
26d714e1c5
|
【优化】等级成长礼
|
2020-12-24 16:06:10 +08:00 |
ZhangBiao
|
c57944e742
|
Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
|
2020-12-24 15:13:15 +08:00 |
ZhangBiao
|
78ead0e8ad
|
【大闹天宫】一键上阵招募英雄
|
2020-12-24 15:13:03 +08:00 |
guowei
|
f25f253479
|
【合成优化修改】
|
2020-12-24 15:03:14 +08:00 |
guowei
|
130ee0c212
|
【鸿蒙阵临时改版】
|
2020-12-24 14:43:32 +08:00 |
ZhangBiao
|
8376d74230
|
【无尽副本】战斗失败自动复位时,自动进行一次一键上阵
|
2020-12-24 14:13:58 +08:00 |
ZhangBiao
|
8f9a58468f
|
【新将来袭】左上货币刷新不及时修复
|
2020-12-24 14:06:51 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +08:00 |
jiaoyangna
|
171e9a4690
|
【优化】巅峰赛,十绝阵预告图标双行文字优化
|
2020-12-24 10:45:15 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
jiaoyangna
|
d0982716b3
|
[所向披靡] 提交
|
2020-12-24 10:24:11 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
jiaoyangna
|
58de2dc2b5
|
【逍遥游优化】逍遥游玩法优化内容 红点修改
|
2020-12-24 09:55:57 +08:00 |
jiaoyangna
|
3a6e07bf1c
|
【逍遥游优化】逍遥游玩法优化内容
|
2020-12-23 20:18:43 +08:00 |
ZhangBiao
|
bb8321b4e3
|
【新将活动】连续抽卡妖精次数不足修复
|
2020-12-23 17:45:16 +08:00 |
guowei
|
2ac574ff06
|
【鸿蒙阵bug】更新
|
2020-12-23 17:41:31 +08:00 |
ZhangBiao
|
8801a84c2b
|
【新将活动】商店跳转修复
|
2020-12-23 17:28:20 +08:00 |
zhangqiang
|
1ba79f4627
|
【装备页面】神将一键装备功能提示 已为最强装备
|
2020-12-23 16:46:41 +08:00 |
ZhangBiao
|
8477ecf347
|
【降妖夺宝】抽卡妖晶限购计数错误修复
|
2020-12-23 16:33:41 +08:00 |
zhangqiang
|
9d6574d3b3
|
【优化】公会援助赠送的按钮时间间隔过长,优化按钮连续点击的效果。只加了按钮点击动画
|
2020-12-23 16:00:10 +08:00 |
jiaoyangna
|
4a6d8d0561
|
【优化】移除点将台界面的进入动画
|
2020-12-23 15:06:56 +08:00 |
guowei
|
47cc019082
|
【拍脸优化】
|
2020-12-23 14:54:53 +08:00 |
jiaoyangna
|
4520616bd0
|
Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
|
2020-12-23 14:52:22 +08:00 |
jiaoyangna
|
41977a85f5
|
【优化】删除十绝阵敌方阵容上的血条和怒气条
|
2020-12-23 14:52:13 +08:00 |
ZhangBiao
|
d0b94a1c3b
|
【新将活动】新将来袭、新疆招募、升星有礼 提交
|
2020-12-23 14:36:15 +08:00 |
zhangqiang
|
47397d8b06
|
【优化】优化编队界面,现在拖动下阵/换位的操作不流畅,经常失败
|
2020-12-23 14:32:59 +08:00 |
ZhangBiao
|
02fe110563
|
【社稷大典】公会检查跳转失败修复
(cherry picked from commit 6d5a9f9f42)
|
2020-12-23 11:38:00 +08:00 |
ZhangBiao
|
6fc63af086
|
【增加跳转】增加跳转id
|
2020-12-23 11:31:58 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
ZhangBiao
|
239dc826df
|
【升星有礼】合并分支资源名修改
|
2020-12-23 11:22:44 +08:00 |
ZhangBiao
|
e40364082c
|
Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:21:27 +08:00 |
ZhangBiao
|
9e7f7454e8
|
【降妖夺宝】合并分支资源名修改
|
2020-12-23 11:15:54 +08:00 |
ZhangBiao
|
30f8049ef5
|
Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-12-23 11:13:48 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
guowei
|
fcb2e4604a
|
【优化】提交
|
2020-12-23 10:10:48 +08:00 |
guowei
|
54deb133e4
|
【更新】
|
2020-12-22 20:12:38 +08:00 |
guowei
|
4e0da5c05d
|
【鸿蒙阵遗漏内容】
|
2020-12-22 19:56:37 +08:00 |
guowei
|
49af5efcdb
|
【合成内容优化】
|
2020-12-22 19:55:39 +08:00 |
guowei
|
e6963e85d9
|
【鸿蒙阵新版】
|
2020-12-22 19:27:49 +08:00 |
guowei
|
0dd211f896
|
【鸿蒙阵】更新
|
2020-12-22 15:41:45 +08:00 |
zhangqiang
|
bb140eab60
|
【鸿蒙阵】 资源漏提
|
2020-12-22 11:33:25 +08:00 |
JieLing
|
a03cd232ee
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-22 11:17:42 +08:00 |
guowei
|
8a0574cb6a
|
【鸿蒙阵】
|
2020-12-22 11:06:23 +08:00 |
zhangqiang
|
4db72018cb
|
【鸿蒙阵】 提示变更
|
2020-12-22 09:52:40 +08:00 |
gaoxin
|
a0f059ca9b
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:58 +08:00 |
DESKTOP-98AVA47\Administrator
|
b11cf4dfe3
|
【巅峰赛】拍脸修改 有表 张强提交
|
2020-12-24 21:04:33 +08:00 |
gaoxin
|
f26796653d
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:03 +08:00 |
guowei
|
ef02f1b6e9
|
【鸿蒙阵更新】
|
2020-12-21 18:19:38 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
gaoxin
|
03e3d77bb6
|
【优化】橙色改为金色
|
2020-12-21 16:15:17 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
guowei
|
314665aa2d
|
【鸿蒙阵修改】
|
2020-12-21 15:10:23 +08:00 |
ZhangBiao
|
3262a6203c
|
【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7)
|
2020-12-21 14:19:41 +08:00 |
guowei
|
0454746498
|
【鸿蒙阵】
|
2020-12-21 10:08:30 +08:00 |
JieLing
|
a9543de95d
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-18 20:11:43 +08:00 |
JieLing
|
fa24af770b
|
【协议】战斗协议添加id字段
|
2020-12-18 19:38:18 +08:00 |
JieLing
|
e8aa2751a9
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-18 19:33:25 +08:00 |
zhangqiang
|
4b49661f24
|
【鸿蒙阵】修改
|
2020-12-18 18:25:38 +08:00 |
gaoxin
|
79f6090afb
|
【协议】回滚系统消息item字段类型
|
2020-12-18 18:22:52 +08:00 |
gaoxin
|
eeb7ecba91
|
【资源】资源名重复修改
|
2020-12-18 18:01:08 +08:00 |
guowei
|
f84e97f531
|
【鸿蒙阵选人界面】
|
2020-12-18 17:41:33 +08:00 |
guowei
|
2a1546b7a4
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab
|
2020-12-18 17:28:22 +08:00 |
guowei
|
d7414a03bd
|
【鸿蒙阵选人界面】
|
2020-12-18 17:24:03 +08:00 |
gaoxin
|
ec47ec2b1c
|
【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据
|
2020-12-18 16:51:28 +08:00 |
gaoxin
|
ef1ced3ef7
|
【战报系统】基础功能添加
|
2020-12-18 16:51:13 +08:00 |
zhangqiang
|
00980feb57
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
|
2020-12-18 16:38:03 +08:00 |
zhangqiang
|
e09ed9fdfc
|
【鸿蒙阵】 限制
|
2020-12-18 16:37:56 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
ZhangBiao
|
72f2dd0e90
|
【主题活动】删除多余的预设
|
2020-12-18 14:05:17 +08:00 |
guowei
|
8438bb9de6
|
【补充 鸿蒙阵贴图】
|
2020-12-18 13:40:59 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |