zhangqiang
|
aae0749f1a
|
【英雄升星祭品】提交 ——4
|
2021-04-20 13:48:55 +08:00 |
zhangqiang
|
d7a74e8256
|
【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位
|
2021-04-20 11:43:24 +08:00 |
zhangqiang
|
189e0f6062
|
【魂印优化】魂印界面的神将头像框颜色,改为当前神将实际星级对应的颜色
|
2021-04-20 11:24:19 +08:00 |
zhangqiang
|
7aefe7f4db
|
【日常副本】“今日剩余次数”修改为“今日剩余免费次数”
|
2021-04-20 11:19:17 +08:00 |
zhangqiang
|
a4727e6de7
|
【升星优化】选择祭品神将页面,按照神将图鉴排序的反向规则进行排列,使珍贵的神将排序更为靠后,本体仍放在最后的位置
|
2021-04-20 11:13:03 +08:00 |
zhangqiang
|
bee0fa412e
|
【神将合成】化虚坛和选择祭品界面添加长按头像功能 2
|
2021-04-20 10:38:28 +08:00 |
zhangqiang
|
3f903cf911
|
【神将合成】化虚坛和选择祭品界面添加长按头像功能
|
2021-04-20 10:17:57 +08:00 |
ZhangBiao
|
37003eea1b
|
【限时神装】更换背景图
|
2021-04-19 20:28:06 +08:00 |
zhangqiang
|
4bb6004ace
|
【英雄升星祭品】提交——3
|
2021-04-19 18:05:15 +08:00 |
gaoxin
|
fbe886fc85
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-19 16:15:12 +08:00 |
zhangqiang
|
1942875c2e
|
【图鉴重叠】
|
2021-04-19 16:14:51 +08:00 |
gaoxin
|
d6cad28914
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-19 16:14:18 +08:00 |
wangzhenxing
|
bf6d29d677
|
【ID1008678】
【战斗统计优化】战斗统计中关卡敌人显示具体的星级和品质边框
|
2021-04-19 16:08:15 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
gaoxin
|
a7575c7d37
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-19 13:59:14 +08:00 |
gaoxin
|
2c80bc9953
|
【资源】同名资源文件处理修改
|
2021-04-19 13:59:01 +08:00 |
zhangqiang
|
9706cd776d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-19 13:46:34 +08:00 |
zhangqiang
|
de76c697c4
|
【英雄升星祭品】提交——01
|
2021-04-19 13:46:24 +08:00 |
zhangqiang
|
9b533fff0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-17 17:50:24 +08:00 |
zhangqiang
|
1f6b8de581
|
【英雄详情】修改
|
2021-04-17 17:50:08 +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 |