jiaoyangna
|
571591eb81
|
竞技场修改提交
|
2021-03-02 11:59:01 +08:00 |
jiaoyangna
|
ae9c306ee6
|
字体修改优化提交
|
2021-03-02 11:40:07 +08:00 |
ZhangBiao
|
54cfbac8fa
|
【本地化】巅峰赛白片
|
2021-03-02 10:57:07 +08:00 |
JieLing
|
39a41f45f9
|
【回滚提交】
|
2021-03-01 19:48:34 +08:00 |
ZhangBiao
|
fc08ad0bdf
|
【本地化】
|
2021-03-01 18:29:21 +08:00 |
ZhangBiao
|
01e39e0435
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:27:15 +08:00 |
ZhangBiao
|
dab25d828f
|
【本地化】
|
2021-03-01 17:27:06 +08:00 |
jiaoyangna
|
3b917f4c87
|
文字字体修改完善
|
2021-03-01 17:22:58 +08:00 |
jiaoyangna
|
6506a48bad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:06:09 +08:00 |
jiaoyangna
|
f07c4c3952
|
字体修改提交
|
2021-03-01 17:06:03 +08:00 |
zhangqiang
|
1dd774601a
|
语法错误
|
2021-03-01 16:57:23 +08:00 |
zhangqiang
|
d7f3fc25dd
|
语法错误
|
2021-03-01 16:56:52 +08:00 |
ZhangBiao
|
aef41d8157
|
【本地化】
|
2021-03-01 16:18:34 +08:00 |
ZhangBiao
|
9b70a72ce7
|
【本地化】公会boss排名消失
|
2021-03-01 15:09:10 +08:00 |
ZhangBiao
|
84d85ca3a6
|
【本地化】装备显示错误
|
2021-03-01 14:49:33 +08:00 |
ZhangBiao
|
72f28280ee
|
【本地化】排行榜显示跳行
|
2021-03-01 11:39:07 +08:00 |
ZhangBiao
|
a3debe0e0e
|
【本地化】英文版本首次试炼必得五星显示不全
|
2021-03-01 11:34:05 +08:00 |
ZhangBiao
|
9a528217d8
|
【本地化】观音技能白片
|
2021-03-01 11:15:15 +08:00 |
gaoxin
|
6100400afa
|
【本地化】修复鸿蒙阵白片
|
2021-02-27 19:30:23 +08:00 |
gaoxin
|
fffa09cbdb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 19:21:31 +08:00 |
gaoxin
|
d6613db511
|
【本地化】修复鸿蒙阵白片
|
2021-02-27 19:21:25 +08:00 |
zhangqiang
|
b281d6e5cb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 18:14:53 +08:00 |
zhangqiang
|
aa0ccbc52c
|
【越南语】功能解锁
|
2021-02-27 18:14:39 +08:00 |
gaoxin
|
159dd3fa1d
|
【引导临时处理】关闭高级账号的引导
|
2021-02-27 18:09:58 +08:00 |
zhangqiang
|
843900d659
|
【越南语】修改
|
2021-02-27 17:59:07 +08:00 |
gaoxin
|
6faa7a29ae
|
Merge branch '0功能/周版本优化0303' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-02-27 17:32:37 +08:00 |
gaoxin
|
1ca6517454
|
Merge commit '0bd2c53e6c38b87ace2ab14a979a56362d35fc7e' into 0功能/周版本优化0303
|
2021-02-27 17:31:09 +08:00 |
zhangqiang
|
73d50e9777
|
Merge branch '0功能/周版本优化0303' into master_xma_local
|
2021-02-27 16:55:47 +08:00 |
zhangqiang
|
656ebc2d44
|
【十绝阵】排名修改提交
|
2021-02-27 16:54:52 +08:00 |
zhangqiang
|
2ef4340998
|
代码错误
|
2021-02-27 16:52:26 +08:00 |
zhangqiang
|
ed26774755
|
【ScrollCycleView】修改6
|
2021-02-27 16:52:18 +08:00 |
wangzhenxing
|
55972b70d7
|
【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
|
2021-02-27 16:52:12 +08:00 |
wangzhenxing
|
9362f341a6
|
[战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻
|
2021-02-27 16:52:06 +08:00 |
zhangqiang
|
e3bae7a821
|
提交
|
2021-02-27 16:52:00 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
zhangqiang
|
8e9c439623
|
【越南语】修改
|
2021-02-27 16:36:05 +08:00 |
zhangqiang
|
9739ff3090
|
【越南语】修改
|
2021-02-27 16:21:23 +08:00 |
gaoxin
|
bca617284b
|
【本地化】重置选择神将界面文字超框显示修改
|
2021-02-27 15:52:11 +08:00 |
zhangqiang
|
7a7196f93a
|
【越南语】修改
|
2021-02-27 15:42:50 +08:00 |
gaoxin
|
ae39622310
|
【本地化】充值界面文字显示错乱修改
|
2021-02-27 15:22:24 +08:00 |
gaoxin
|
ff9199d7c9
|
【本地化】修复充值界面礼包按钮资源错误
|
2021-02-27 14:55:53 +08:00 |
gaoxin
|
b3ba0826d9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 14:51:19 +08:00 |
gaoxin
|
d575bd1313
|
【本地化】升级,最大星级白片修改
|
2021-02-27 14:51:14 +08:00 |
zhangqiang
|
efd3ab9216
|
【越南包】问题修改
|
2021-02-27 14:47:57 +08:00 |
gaoxin
|
570352ea2c
|
【本地化】鸿蒙阵按钮资源修改,三界降魔按钮文字资源
|
2021-02-27 14:34:36 +08:00 |
liujiaqi
|
59cfcff035
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-26 17:26:39 +08:00 |
liujiaqi
|
8a00efca60
|
共鸣 英雄界面 提交
|
2021-02-26 17:26:17 +08:00 |
wangzhenxing
|
0bd2c53e6c
|
【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
|
2021-02-26 18:19:54 +09:00 |
JieLing
|
619b3d9983
|
【本地化】挂机界面优化
|
2021-02-26 17:16:37 +08:00 |
wangzhenxing
|
7ae746b318
|
[战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻
|
2021-02-26 17:00:05 +09:00 |
gaoxin
|
2eb23e406b
|
【本地化】修复月卡界面英文显示错误
|
2021-02-26 15:52:35 +08:00 |
gaoxin
|
16486a13b5
|
【本地化】添加按比例缩小文字的方法
|
2021-02-26 15:37:50 +08:00 |
gaoxin
|
5fee9ee759
|
【bug】修复领取奖励报错的问题
|
2021-02-26 14:39:25 +08:00 |
jiaoyangna
|
84ae606ee9
|
限时召唤白片提交
|
2021-02-26 13:47:04 +08:00 |
jiaoyangna
|
8753e784ec
|
图片提交
|
2021-02-26 13:44:50 +08:00 |
liujiaqi
|
866fd6c3fc
|
【资源】越南语临时资源替换
|
2021-02-26 11:23:02 +08:00 |
jiaoyangna
|
9f05f94439
|
本地化
|
2021-02-26 10:53:37 +08:00 |
zhangqiang
|
545dee3df1
|
【ScrollCycleView】修改4
|
2021-02-26 10:37:39 +08:00 |
jiaoyangna
|
3f38b704be
|
已修改
|
2021-02-26 10:32:02 +08:00 |
gaoxin
|
edec649f64
|
【bug】修复合成时log信息导致的报错
|
2021-02-26 10:13:27 +08:00 |
gaoxin
|
584431db2e
|
【bug】修复新将战斗跳过回到新将界面还会播放战斗音效的问题
|
2021-02-26 10:08:36 +08:00 |
jiaoyangna
|
b93f69cfa6
|
文字导出
|
2021-02-26 09:59:01 +08:00 |
jiaoyangna
|
f08477cbd6
|
积分礼包领不了
|
2021-02-25 21:45:52 +08:00 |
jiaoyangna
|
6bf391f175
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 21:43:03 +08:00 |
jiaoyangna
|
bacf88be86
|
日志,本地化修改
|
2021-02-25 21:42:38 +08:00 |
gaoxin
|
db1cd07e4f
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 21:42:38 +08:00 |
gaoxin
|
2f22ac850a
|
【本地化】资源导入调整
|
2021-02-25 21:40:05 +08:00 |
wangzhenxing
|
0e23ca3cf8
|
[战斗]======= 2021-0303发布计划 战斗修改
|
2021-02-25 19:48:24 +09:00 |
jiaoyangna
|
e46d735134
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 18:36:55 +08:00 |
jiaoyangna
|
69a2253d12
|
装备提交
|
2021-02-25 18:36:50 +08:00 |
gaoxin
|
20622e5e62
|
【本地化】文字自适应大小并自动换行
|
2021-02-25 17:46:32 +08:00 |
gaoxin
|
c6430f59a5
|
【本地化】乾坤宝盒界面相关修改
|
2021-02-25 17:31:26 +08:00 |
gaoxin
|
5a4742610a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 16:12:51 +08:00 |
gaoxin
|
22536f7076
|
【本地化】限时召唤,按钮拉长,气泡随文字多少变化
|
2021-02-25 16:12:46 +08:00 |
jiaoyangna
|
f25d5b7242
|
合成神将修改
|
2021-02-25 15:56:52 +08:00 |
jiaoyangna
|
d2dbaec760
|
英雄合成提交
|
2021-02-25 15:46:27 +08:00 |
jiaoyangna
|
4c88ab3c39
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 15:41:44 +08:00 |
jiaoyangna
|
3a31425e5a
|
装备合成界面修改
|
2021-02-25 15:41:34 +08:00 |
gaoxin
|
2f59385c18
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 15:38:34 +08:00 |
gaoxin
|
7ea798b693
|
【本地化】部分活动介绍界面内容改为可滑动
|
2021-02-25 15:38:27 +08:00 |
jiaoyangna
|
46bc97fdeb
|
魂印界面修改提交
|
2021-02-25 15:36:46 +08:00 |
jiaoyangna
|
0e80a3ee5a
|
玩家信息界面修改
|
2021-02-25 15:28:08 +08:00 |
jiaoyangna
|
ee5e5777f3
|
社稷大点, 活动任务提交
|
2021-02-25 15:20:49 +08:00 |
jiaoyangna
|
db9f456676
|
没有翻译图片显示中文
|
2021-02-25 15:10:44 +08:00 |
jiaoyangna
|
7a0730fbe7
|
容错修改
|
2021-02-25 15:04:54 +08:00 |
gaoxin
|
9c15d51669
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-02-25 14:33:27 +08:00 |
gaoxin
|
0babcc640b
|
【报警】添加用于确认登录成功的接口,后端用于登录监测告警
|
2021-02-25 14:33:23 +08:00 |
jiaoyangna
|
fc28bb9e35
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
|
2021-02-25 14:20:51 +08:00 |
jiaoyangna
|
df38aea68e
|
巅峰赛修改
|
2021-02-25 14:20:29 +08:00 |
jiaoyangna
|
c3c1f6abf9
|
去掉颜色显隐
|
2021-02-25 14:19:45 +08:00 |
jiaoyangna
|
fe881897dc
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-02-25 13:47:09 +08:00 |
jiaoyangna
|
e709c80428
|
竞技场修改
|
2021-02-25 13:47:04 +08:00 |
ZhangBiao
|
b2dbdfe599
|
【本地化】page12 14 jumpview
|
2021-02-25 13:31:27 +08:00 |
zhangqiang
|
5699b89258
|
【ScrollCycleView】修改3
|
2021-02-25 12:04:31 +08:00 |
zhangqiang
|
67d0dfa44f
|
【抽卡奖池】显示问题
|
2021-02-25 12:00:27 +08:00 |
ZhangBiao
|
9a54660c1f
|
【本地化】降妖夺宝 新将来袭
|
2021-02-25 11:24:43 +08:00 |
ZhangBiao
|
468731dc53
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 11:17:10 +08:00 |
ZhangBiao
|
1c52db19b6
|
【本地化】page 2 10 12 13 mainshop
|
2021-02-25 11:17:00 +08:00 |
jiaoyangna
|
d14e8a8b31
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 10:41:13 +08:00 |
jiaoyangna
|
e953005b6e
|
活动排行 灵兽抽卡 修改
|
2021-02-25 10:41:07 +08:00 |