jiaoyangna
|
a0ecd56968
|
剧情提交
|
2021-04-22 15:06:47 +08:00 |
jiaoyangna
|
a277c5e6fa
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-17 17:20:58 +08:00 |
jiaoyangna
|
fe837c22f4
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-17 17:20:52 +08:00 |
ZhangBiao
|
9891a41f22
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-17 17:12:34 +08:00 |
ZhangBiao
|
034d0846c5
|
【森罗幻境】提交
|
2021-04-17 17:12:24 +08:00 |
zhangqiang
|
21e35dc81b
|
去掉动画
|
2021-04-17 16:55:37 +08:00 |
zhangqiang
|
777a3f7b30
|
动画修改
|
2021-04-17 16:49:24 +08:00 |
zhangqiang
|
af8aed7701
|
图鉴错乱修改
|
2021-04-17 16:35:38 +08:00 |
JieLing
|
eb5cfeb7f8
|
【每日礼包】一键购买修改
|
2021-04-17 16:16:10 +08:00 |
JieLing
|
f30d2f042e
|
【提审切换】开关活动
|
2021-04-17 16:16:03 +08:00 |
ZhangBiao
|
48720f5dff
|
【新人商城】资源提交
(cherry picked from commit 8922b7eaba )
|
2021-04-17 14:03:35 +08:00 |
zhangqiang
|
1ee7063569
|
【限时招募】 提交
|
2021-04-16 18:13:09 +08:00 |
jiaoyangna
|
296d75d193
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-16 18:06:38 +08:00 |
jiaoyangna
|
909078e7ae
|
【每日礼包】 修改提交
|
2021-04-16 18:06:33 +08:00 |
wangzhenxing
|
4ea42d72a0
|
心魔试炼人物信息界面显示添加好友按钮
|
2021-04-16 16:12:43 +08:00 |
jiaoyangna
|
92104541fc
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-04-16 15:42:39 +08:00 |
jiaoyangna
|
f91b6f8ca1
|
资源重复修改提交
|
2021-04-16 14:53:44 +08:00 |
gaoxin
|
60ccfce6dc
|
【累计充值】第二次销毁时报错
|
2021-04-16 14:23:31 +08:00 |
jiaoyangna
|
fc6f3bd6d1
|
活动修改提交
|
2021-04-16 14:18:58 +08:00 |
wangzhenxing
|
c544767e29
|
[功能]===========新手引导提交,心魔试炼排行榜添加玩家信息
|
2021-04-16 14:09:36 +08:00 |
jiaoyangna
|
444e1e4428
|
限时招募提交
|
2021-04-16 10:08:33 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +08:00 |
gaoxin
|
8eb6c30d95
|
【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug)
|
2021-04-15 19:05:01 +08:00 |
gaoxin
|
2974d71d13
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 19:04:05 +08:00 |
gaoxin
|
fe74e55bc9
|
【十绝阵】文字显示修改 军团战 改为 十绝阵
|
2021-04-15 19:04:00 +08:00 |
zhangqiang
|
3a4d593fdb
|
【礼包 公会援助】列表刷新置顶问题
|
2021-04-15 16:25:00 +08:00 |
gaoxin
|
8f611f0340
|
【大闹天宫】敌人详情弹窗,有图片超框
|
2021-04-15 15:17:43 +08:00 |
gaoxin
|
196a319a4e
|
【跳过战斗】灵兽释放技能时,点击跳过战斗按钮无效
|
2021-04-15 15:11:25 +08:00 |
ZhangBiao
|
4b429e2a87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 14:57:01 +08:00 |
ZhangBiao
|
ac6697b461
|
【森罗】提交
|
2021-04-15 14:56:51 +08:00 |
zhangqiang
|
b37f61f988
|
【宝物分解】
|
2021-04-15 14:35:19 +08:00 |
ZhangBiao
|
d5879c2445
|
【森罗幻境】暂时还原
|
2021-04-15 14:24:40 +08:00 |
ZhangBiao
|
5d47d0b42e
|
【森罗】排序,选择相同将,修复
|
2021-04-15 12:26:47 +08:00 |
ZhangBiao
|
204e922062
|
【礼包判空】略过id=0的礼包
|
2021-04-15 10:28:09 +08:00 |
zhangqiang
|
68658a50c9
|
【宝物分解】
|
2021-04-15 09:56:33 +08:00 |
ZhangBiao
|
fff121933f
|
【森罗幻境】选择相同神将报错修复
|
2021-04-15 09:35:24 +08:00 |
ZhangBiao
|
12a4d787c2
|
|
2021-04-14 20:11:53 +08:00 |
ZhangBiao
|
16625adb84
|
|
2021-04-14 20:06:07 +08:00 |
ZhangBiao
|
5ae5555011
|
【森罗幻境】选择英雄按战力发送英雄顺序
|
2021-04-14 20:00:06 +08:00 |
ZhangBiao
|
de85b844e5
|
【逐圣商店】取消主胜商店红点
|
2021-04-14 17:41:44 +08:00 |
zhangqiang
|
8cf7de1811
|
【大闹天宫】试炼节点显示有问题
|
2021-04-13 18:26:37 +08:00 |
zhangqiang
|
6d21fd41fb
|
【大闹天宫】试炼节点显示bug
|
2021-04-13 17:14:29 +08:00 |
ZhangBiao
|
2214d15550
|
【福星高照】拍脸增加主线引导冲突限制
|
2021-04-13 17:12:28 +08:00 |
ZhangBiao
|
f1864ae6cf
|
Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24 .
|
2021-04-13 16:54:48 +08:00 |
zhangqiang
|
0e8f87f32e
|
【魂印战力计算】bug
|
2021-04-13 16:34:30 +08:00 |
gaoxin
|
e013f396b3
|
【引导战斗】所有剧情放到战斗里
|
2021-04-13 15:10:40 +08:00 |
ZhangBiao
|
3e6d68ee34
|
【福星高照】关闭upview
|
2021-04-13 14:39:35 +08:00 |
ZhangBiao
|
314301c3b0
|
【活动优化】每日礼包(一键购买)按钮 资源替换
|
2021-04-13 14:22:00 +08:00 |
ZhangBiao
|
6e87c6b41c
|
【十五日登录】奖励领完不关闭修复
|
2021-04-13 14:06:42 +08:00 |