Commit Graph

2713 Commits (7d2a90fd900ad235bcbec71794da048045d70485)

Author SHA1 Message Date
gaoxin d6613db511 【本地化】修复鸿蒙阵白片 2021-02-27 19:21:25 +08:00
gaoxin 159dd3fa1d 【引导临时处理】关闭高级账号的引导 2021-02-27 18:09:58 +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 7a7196f93a 【越南语】修改 2021-02-27 15:42:50 +08:00
zhangqiang efd3ab9216 【越南包】问题修改 2021-02-27 14:47:57 +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
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 bacf88be86 日志,本地化修改 2021-02-25 21:42:38 +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 c6430f59a5 【本地化】乾坤宝盒界面相关修改 2021-02-25 17:31:26 +08:00
gaoxin 22536f7076 【本地化】限时召唤,按钮拉长,气泡随文字多少变化 2021-02-25 16:12:46 +08:00
jiaoyangna 46bc97fdeb 魂印界面修改提交 2021-02-25 15:36:46 +08:00
jiaoyangna 0e80a3ee5a 玩家信息界面修改 2021-02-25 15:28:08 +08:00
jiaoyangna 7a0730fbe7 容错修改 2021-02-25 15:04:54 +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
gaoxin 16ea6c16de 【配置】功能配置添加 2021-02-25 14:19:00 +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
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang 67d0dfa44f 【抽卡奖池】显示问题 2021-02-25 12:00:27 +08:00
ZhangBiao 1c52db19b6 【本地化】page 2 10 12 13 mainshop 2021-02-25 11:17:00 +08:00
jiaoyangna f3cc8413f2 主题活动提交 2021-02-25 10:20:14 +08:00
ZhangBiao b15603c722 【本地化】 2021-02-25 10:17:24 +08:00
ZhangBiao 83306455e9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:56:28 +08:00
ZhangBiao 61b22edef5 【本地化】提交 2021-02-24 20:56:01 +08:00
jiaoyangna 19a743a74b Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:40 +08:00
jiaoyangna dc68abaf55 大闹天宫 2021-02-24 20:25:29 +08:00
ZhangBiao 180ad3ab31 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:08 +08:00
ZhangBiao 5834e08ee2 【本地化】提交 2021-02-24 20:24:58 +08:00
zhangqiang 39d43b11bc 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2 2021-02-24 19:48:04 +08:00
jiaoyangna ba8c822b3f Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 18:23:50 +08:00
jiaoyangna a34bd942bf 极速探索提交 2021-02-24 18:23:40 +08:00
ZhangBiao 42d6c9e8b9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 18:17:54 +08:00
ZhangBiao f8bc361605 【本地化】首充 四元阵 2021-02-24 18:17:46 +08:00
jiaoyangna da35c73296 灵兽分解修改 2021-02-24 17:48:35 +08:00
jiaoyangna 661b191fa9 驭兽斋抽卡无响应 2021-02-24 17:45:48 +08:00
jiaoyangna e52b646c3a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 17:38:12 +08:00
jiaoyangna e42193d264 轩辕,森罗修改 2021-02-24 17:37:56 +08:00
ZhangBiao 16a4fa4dde 【本地化】灵兽界面 福利界面 2021-02-24 17:36:24 +08:00
gaoxin bb68af637a 【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题 2021-02-24 17:02:31 +08:00
zhangqiang d454c3bf08 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变 2021-02-24 16:47:20 +08:00
gaoxin 6b128d46ef Merge branch 'xma/dev_temp' into xma/dev 2021-02-24 15:08:38 +08:00
jiaoyangna 541b45e6ea 排行榜提交 2021-02-24 15:07:31 +08:00
JieLing 87f5e271e3 【ScrollCycleView】修改2 2021-02-24 15:01:52 +08:00
JieLing cf0e819d73 【优化】scrollview SetData接口默认回到顶部 2021-02-24 14:56:01 +08:00
JieLing 1b77aec298 【bug】修复scrollview修改导致引导报错的问题 2021-02-24 14:53:59 +08:00
ZhangBiao 1d7f5572cb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 14:45:16 +08:00
ZhangBiao 10e8da678a 【本地化】天宫寻宝相关修改 2021-02-24 14:45:09 +08:00
gaoxin 4b4049e938 【scrollCycleView】 修改1 2021-02-24 14:32:03 +08:00
jiaoyangna af1bb0eb78 礼包抢购 积天豪礼 修改 2021-02-24 14:04:32 +08:00
ZhangBiao fc7879a56a 【本地化】我要变强 首充 2021-02-24 11:47:07 +08:00
ZhangBiao f3e44753e2 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:24:01 +08:00
ZhangBiao 74185b0d1b 【本地化】 2021-02-24 11:23:53 +08:00
jiaoyangna 5acf0b2ed2 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:15:21 +08:00
jiaoyangna 45a4b740d2 红包修改提交 2021-02-24 11:15:03 +08:00
gaoxin 23fa451553 【gm】方法名重复 2021-02-24 11:11:53 +08:00
zhangqiang ac3fe3f251 【升星界面调整】9升10星,十星位置需调整 2021-02-24 10:53:21 +08:00
jiaoyangna fc75b356b0 公会修改 2021-02-24 10:21:44 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
ZhangBiao 91f46cb250 【本地化】森罗幻境修改 2021-02-24 09:48:22 +08:00
ZhangBiao b9d35e4671 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 20:57:35 +08:00
ZhangBiao f98e81bb37 【本地化】无尽副本界面左上右上调整 2021-02-23 20:57:26 +08:00
zhangqiang 497729e762 【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上 2021-02-23 20:50:56 +08:00
jiaoyangna 576400a914 公会商店本地化修改提交 2021-02-23 20:50:34 +08:00
zhangqiang f7d62a72fc 恭喜获得界面中,道具名称过长的情况,改为显示4个字+省略号的形式显示,参考背包即可 2021-02-23 20:37:57 +08:00
jiaoyangna 59af047cd9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 20:18:32 +08:00
jiaoyangna f5450e201d 公会提交 2021-02-23 20:18:25 +08:00
ZhangBiao 82db5c4b57 【本地化】排行榜修改 2021-02-23 20:13:59 +08:00
gaoxin 169ad402c7 【本地化】修复白片得问题 2021-02-23 19:12:16 +08:00
ZhangBiao 1c77912e61 【本地化】开服狂欢修改 2021-02-23 18:15:15 +08:00
ZhangBiao 543e0b7b22 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 17:43:08 +08:00
ZhangBiao 5d1b8bf9b9 【本地化】界面挑战 2021-02-23 17:41:59 +08:00
jiaoyangna ddad4544ed tips 提交 2021-02-23 17:17:35 +08:00
zhangqiang 2bc7c4e72c 【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效 2021-02-23 17:16:38 +08:00
zhangqiang 37375a41f8 【鸿蒙阵】请先解锁前一个共鸣位置 2021-02-23 17:16:32 +08:00