Commit Graph

2088 Commits (b637d17a9baa86ababa67e84945317eed8a47649)

Author SHA1 Message Date
ZhangBiao 021692dc42 逍遥commit 2020-10-19 22:36:43 +08:00
jiaoyangna 6f0294902f Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
2020-10-19 22:25:23 +08:00
jiaoyangna 4aa18b7ac1 推送礼包派脸修改 2020-10-19 22:01:44 +08:00
jiaoyangna 61a07de094 拍脸commit 2020-10-19 22:01:34 +08:00
jiaoyangna a4dd2ffd38 心魔试炼 1 2020-10-19 22:01:15 +08:00
yuanshuai a19942820e 自动游历功能屏蔽 2020-10-19 21:40:53 +08:00
yuanshuai 3b8317a897 逍遥游红点提交 2020-10-19 21:40:48 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00
jiaoyangna 91778b2f77 【逍遥游】归元弹窗添加 2020-10-19 21:38:25 +08:00
gaoxin ed26e9e758 公会副本刷新次数打印提交 2020-10-19 21:30:19 +08:00
ZhangBiao 1c955039ec Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-19 21:25:22 +08:00
ZhangBiao e3bd86ef08 轩辕 修改 提交
(cherry picked from commit 27f8331e62)
2020-10-19 21:25:12 +08:00
gaoxin 73063a72e3 【战斗0.0.4】代码遗漏补齐, 2020-10-19 21:06:01 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
gaoxin b409a1ac4d 【资源】宝器资源更新 2020-10-19 20:34:30 +08:00
ZhangBiao cd782feb4d Merge branch '0活动开发聚集地/竞技场界面修改' into master_xma_local 2020-10-19 20:14:31 +08:00
ZhangBiao 56f5856a71 宝箱个数减负 2020-10-19 20:10:53 +08:00
ZhangBiao 43201d2172 每日 赛季奖励 显示错误修复 2020-10-19 19:41:36 +08:00
ZhangBiao b52ebf46f4 竞技场 bug修改 2020-10-19 19:34:48 +08:00
ZhangBiao 4c5065ccf7 竞技场界面修改 2020-10-19 18:52:36 +08:00
gaoxin d33fe98ef1 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 18:38:15 +08:00
gaoxin 05780afedb 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 18:37:59 +08:00
gaoxin 321aa22ec6 【战斗 0.0.3】尝试修复偶现战斗卡死得问题 2020-10-19 18:37:51 +08:00
ZhangBiao e39706e312 遴选 社稷大典中对奖励界面的修改,到竞技场界面修改 2020-10-19 14:01:30 +08:00
ZhangBiao 09c3da664e 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
gaoxin 5dc4062a46 【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题 2020-10-17 20:08:40 +08:00
gaoxin 6326a8ab9a 【战斗0.0.1-同步local】添加引导战斗暂停接口 2020-10-17 19:03:34 +08:00
gaoxin 0baed21bf6 战斗逻辑同步 2020-10-17 18:35:52 +08:00
gaoxin 3810fc2da1 修复关卡推送礼包报错的问题 2020-10-17 18:19:03 +08:00
gaoxin 5e7bcff321 【竞技场周任务减负-1】前端还没做,表提交错误处理 2020-10-17 16:50:32 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
ZhangBiao 0dbf805ef8 限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d)
2020-10-23 17:38:45 +08:00
ZhangBiao 3b3a41c432 主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc)
2020-10-23 17:38:33 +08:00
JieLing 386992eaa9 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-16 18:13:36 +08:00
ZhangBiao 9ac6eac395 礼包拍脸时机修复 2020-10-16 18:11:24 +08:00
ZhangBiao 4c55e3f1f0 推送礼包 special表id更改 2020-10-16 18:09:13 +08:00
ZhangBiao 8c4ff7e148 推送礼包 完事儿 2020-10-16 17:59:16 +08:00
jiaoyangna 435590808a 推送礼包修改 2020-10-16 17:59:00 +08:00
jiaoyangna 0fe316420a 推送礼包修改 2020-10-16 17:58:46 +08:00
ZhangBiao f0e9063c97 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-16 17:56:39 +08:00
jiaoyangna d340795646 主题活动修改 提交 2020-10-10 17:59:30 +08:00
jiaoyangna 9706c45942 主题活动修改 2020-10-10 16:15:27 +08:00
jiaoyangna d51468cdca 势不可挡页签修改提交 2020-10-10 16:14:33 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 8c5132185b 轩辕宝镜黑屏问题解决 2020-10-10 16:05:02 +08:00
gaoxin 8e3e25a450 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:32:37 +08:00
jiaoyangna 04e6526819 神州令修改提交 2020-10-15 21:48:41 +08:00
jiaoyangna f35bad0ee2 神州令跳转修改 2020-10-15 21:36:16 +08:00
jiaoyangna 14986fb3f5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-15 21:30:32 +08:00
jiaoyangna 98c80ed67c 森罗幻境 修改 2020-10-15 21:26:56 +08:00
jiaoyangna 7bea4cf26c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-22 01:25:09 +08:00
jiaoyangna 36559e89a7 【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点 2020-10-22 01:25:03 +08:00
jiaoyangna 72c09f393c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-21 23:18:44 +08:00
jiaoyangna 97bb590c24 主题活动修改 2020-10-21 23:18:39 +08:00
JieLing bff69e473d 招募玩家详情展示魂印有问题 2020-10-13 15:51:20 +08:00
ZhangBiao 2469c75f90 森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
(cherry picked from commit 677dca14e7)
2020-10-13 14:01:47 +08:00
JieLing 602c8e9e02 监听事件未移除正确 2020-10-12 20:44:15 +08:00
zhangqiang fe8c903b31 限时升级活动打开后 退出一段时间再返回报错 2020-10-12 19:34:33 +08:00
jiaoyangna 2b6705f176 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 17:13:44 +08:00
jiaoyangna 31895e8e25 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:44 +08:00
jiaoyangna 13b9886ddb Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:56:10 +08:00
jiaoyangna e84efa0961 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:05 +08:00
ZhangBiao e2b0244881 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:08:23 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
zhangqiang 721418b30a 线上问题 宝器分解bug 2020-10-12 15:55:04 +08:00
JieLing d58311bb2b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 15:43:06 +08:00
gaoxin 199326c74b 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 15:42:12 +08:00
ZhangBiao aec2eb929c (cherry picked from commit f087c0258b) 2020-10-12 15:39:57 +08:00
ZhangBiao ff33dd07db 森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
2020-10-12 15:15:02 +08:00
ZhangBiao a47d882155 森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
2020-10-12 15:14:27 +08:00
zhangqiang 2f31dad427 线上问题 vip 战力计算打开 只是表的 pvp 评分配成0 2020-10-12 14:48:22 +08:00
zhangqiang b92be60aef 线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错 2020-10-12 14:47:56 +08:00
gaoxin d9fbacce65 修改bug 限时活动itemView报错 2020-10-12 14:47:42 +08:00
zhangqiang 89d70855a4 线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3 2020-10-12 14:47:20 +08:00
zhangqiang d2792bdb8b 线上活动 森罗幻境达人前端修改2 2020-10-12 14:47:02 +08:00
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
gaoxin 36b366bf97 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 14:35:23 +08:00
jiaoyangna 49e94e9204 森罗幻境动画删除 2020-10-12 14:00:55 +08:00
jiaoyangna 0c91a81329 【跳转】碧海卷使用按钮跳转位置不正确 2020-10-15 16:05:53 +08:00
jiaoyangna b574323186 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-15 16:01:07 +08:00
jiaoyangna 0b0776c220 【丹心碧血】限时兑换活动界面黑屏 2020-10-15 16:00:58 +08:00
ZhangBiao eb7b46f992 大闹天宫节点商店名称与内容不符修复
(cherry picked from commit 314dee578a)
2020-10-10 14:51:45 +08:00
jiaoyangna 0d99260d1a 【丹心碧血】限时召唤,up卡显示不正确 2020-10-10 13:39:50 +08:00
gaoxin 77b3855221 如果宝物被分解了,重复穿戴检测会报错 2020-10-10 10:35:49 +08:00
gaoxin b95a75310c 再次修复登录时区服显示错误的问题 2020-10-10 10:00:07 +08:00
JieLing bd09adfcba Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-10 09:59:35 +08:00
jiaoyangna e7a695553f 轩辕宝镜关闭时销毁时间 2020-10-24 09:44:56 +08:00
gaoxin 9ff73bfa4c 添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上 2020-10-09 21:46:03 +08:00
JieLing b50602d94c Merge branch 'master_xma_test' into master_xma_local 2020-10-09 17:02:03 +08:00
jiaoyangna 3deee80779 限时抢购界面修改 2020-10-15 21:28:23 +08:00
jiaoyangna 4ba6146a46 限时抢购界面修改 2020-10-15 21:24:08 +08:00
jiaoyangna 7b9a4140f7 青龙秘宝任务报错修改 2020-10-15 18:18:46 +08:00
jiaoyangna 8b75d0a9d1 百宝商会修改提交 2020-10-15 17:16:32 +08:00
jiaoyangna 8759e04261 购买等级报错修改 2020-10-15 16:38:32 +08:00
jiaoyangna feda1432e3 Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-10-15 16:32:08 +08:00
jiaoyangna 8b1012892f 青龙秘宝礼包状态修改 2020-10-15 16:31:53 +08:00
zhangqiang 297d71d2ff 线上问题 无尽副本轮换前5分钟无法进入 2020-10-09 15:21:00 +08:00
zhangqiang f56fa9d4e8 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-09 15:20:53 +08:00
gaoxin 422a8abaa4 修复属性类被动会导致战斗日志报错的问题 2020-10-09 14:26:28 +08:00
jiaoyangna 8ff0382e41 丹心碧血主界面icon 修改提交 2020-10-15 14:06:16 +08:00
jiaoyangna 2e272debe3 一键宝物重复穿戴宝物bug 修改 2020-10-15 14:06:06 +08:00
jiaoyangna d249eb412f 丹心碧血提交 2020-10-15 14:05:56 +08:00
jiaoyangna 8a43d1c9da 主题活动修改 2020-10-15 14:05:41 +08:00
ZhangBiao 2e45c0cd83 主题活动预设修改 2020-10-15 14:05:24 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
zhangqiang a697e38584 修改为正式服 2020-09-30 11:15:56 +08:00
JieLing bd5d9da3bf 部分功能通过判断提审服和正式服进行开启和关闭 2020-09-30 11:14:43 +08:00
zhangqiang 79309899b0 青龙秘宝礼包更新问题 2020-09-30 11:00:12 +08:00
zhangqiang 42f0f9b5fe 修复三界降魔头像框点击无反应 2020-09-30 10:34:07 +08:00
zhangqiang 48a462f37f 打点包名判断修改 2020-09-29 15:15:58 +08:00
jiaoyangna 5acae5c31d Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-09-29 11:31:45 +08:00
jiaoyangna fd2f210c5b 【ID1010112】【魂印】在大闹天宫中招募神将后,神将身上的魂印会显示在玩家装备魂印时的列表中 2020-09-29 11:30:52 +08:00
zhangqiang c668a522dd 寻宝缺失资源提交 2020-09-29 10:46:57 +08:00
jiaoyangna 124fc753a0 达人图片提交 2020-09-29 10:32:57 +08:00
jiaoyangna 054ea80a3c 活动icon 提交 2020-09-29 10:30:19 +08:00
jiaoyangna c7836b8aea 编队界面修改提交 2020-09-28 21:08:12 +08:00
jiaoyangna fc28d51836 VIPpanel2修改 2020-09-28 20:02:36 +08:00
jiaoyangna ce14511e3c Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-09-28 20:00:20 +08:00
jiaoyangna c6142a96f8 青龙秘宝等级界面时间销毁修改 2020-09-28 19:58:56 +08:00
JieLing 83b1d46e2a 勇冠三军累计充值领取按钮状态修复 2020-09-28 18:15:07 +08:00
zhangqiang 95dcbfb0c7 四元阵去掉没有的音效 2020-09-28 17:54:04 +08:00
zhangqiang fc45eaf562 四元阵单抽卡适配 2020-09-28 17:53:46 +08:00
JieLing 62072b5b1e 限时活动显示兑换显示问题 2020-09-28 17:41:24 +08:00
gaoxin 75a8cade8b 默认头像修改 2020-09-28 17:35:34 +08:00
jiaoyangna 6f0b87c858 轩辕适配修改,文字颜色修改 2020-09-28 16:56:22 +08:00
jiaoyangna 74d675ee95 Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-09-28 16:33:21 +08:00
jiaoyangna 9875595535 添加进入轩辕宝镜编队界面的逻辑 2020-09-28 16:32:59 +08:00
ZhangBiao 5cef7f561a 女人物大小修改
(cherry picked from commit 5320fb5211)
2020-09-28 16:06:31 +08:00
JieLing 8afa0c96a8 签到修改 2020-09-28 15:43:39 +08:00
JieLing 0fdac5e7d3 成长基金领取报错修改,签到报错修改,天赋提示文字 2020-09-28 15:41:17 +08:00
JieLing ee65632939 成长基金修改 2020-09-28 15:35:28 +08:00
JieLing 39105d8de3 轩猿修改 2020-09-28 15:20:27 +08:00
JieLing f4f505eb6c 轩辕提示修改提交 2020-09-28 15:16:49 +08:00
JieLing bd21a12b98 轩辕commit 2020-09-28 15:08:35 +08:00
JieLing b7cd64f977 开服狂欢不可完成奖励修改,日常任务弹活动关闭异常 2020-09-28 14:11:00 +08:00
JieLing e5b42a0840 修复第四周活动二级弹窗显示错误 2020-09-28 11:33:49 +08:00
JieLing 170b706504 修复引导商店报错 2020-09-28 11:13:11 +08:00
JieLing 823ae72aec 修复0元礼包无法购买的问题,修复引导合成碎片卡死 2020-09-28 10:27:06 +08:00
JieLing 223f8b11b4 修复在手机上战斗报错 2020-09-27 20:54:50 +08:00
jiaoyangna 947d647266 轩辕修改提交 2020-09-27 20:40:30 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
zhangqiang 46a9536c19 线上 : 战力计算 注释 VIP属性加成 2020-09-27 19:16:33 +08:00
gaoxin 673070438b 头像默认显示复原 2020-09-27 19:05:09 +08:00
jiaoyangna fc727e1061 时间销毁 2020-09-27 18:29:41 +08:00
jiaoyangna b7b6b4189c 碎片属性图片修改提交 2020-09-27 18:29:20 +08:00
JieLing 907d092c04 遗漏同步提交 2020-09-27 18:27:20 +08:00
gaoxin bf3641d6c3 物品框添加头像框的特效 2020-09-27 16:58:21 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
liujiaqi 7503616dac 9.25更新,未同步到online,排名头像框123, 2020-09-27 16:57:10 +08:00
gaoxin 541b4fc271 战斗逻辑同步 2020-09-27 16:56:15 +08:00
JieLing c3cce0b06e 百宝商会活动添加 2020-09-27 16:52:40 +08:00
ZhangBiao def3e829ff 三界降魔 2020-09-27 16:44:39 +08:00
ZhangBiao 97f9b8f671 遴选三界除魔 2020-09-27 16:44:31 +08:00
ZhangBiao d601794a17 三界降魔 2020-09-27 16:43:49 +08:00
ZhangBiao e9b994126e 三界降魔 2020-09-27 16:43:42 +08:00
ZhangBiao c4706208ef 三界除魔功能添加 2020-09-27 16:43:33 +08:00
JieLing c6391090f2 三界除魔界面添加 2020-09-27 16:38:44 +08:00
jiaoyangna 6a764f569e 跳转限时兑换修改 2020-09-27 16:21:42 +08:00
gaoxin 5b7e3c7a9b 每日一键购买礼包金额显示添加 2020-09-27 16:15:46 +08:00
zhangqiang 55e159d665 线上活动 : 四周活动 天宫达人 问题 2020-09-27 16:15:21 +08:00
zhangqiang 96ab48c22f 遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-27 16:14:42 +08:00
zhangqiang bd6fdce461 遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-27 16:12:21 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
JieLing e9159cc1ca 修复大闹天宫招募带有宝物的英雄会导致登陆卡死的问题,针对装备丢失添加判空操作避免登陆卡死 2020-09-27 15:09:28 +08:00
JieLing 4c9db13851 修复青龙秘宝不关闭bug 2020-09-23 17:41:48 +08:00
JieLing 443a157006 【破阵诛仙】点金达人任务,跳转点金,不计数,修复乾坤宝盒快速切换报错的问题 2020-09-22 18:13:49 +08:00
JieLing f58f067fe5 Revert "【破阵诛仙】点金达人任务,跳转点金,不计数"
This reverts commit c5ffb7cb23.
2020-09-22 18:01:41 +08:00
jiaoyangna 17675838d7 漏提 2020-09-22 17:46:55 +08:00
jiaoyangna dd8e9ab701 青龙秘宝入口修改 2020-09-22 17:46:44 +08:00
ZhangBiao e3b387b8af 十绝阵奖励偏移修改 2020-09-22 17:39:14 +08:00
gaoxin 7a6ae258fb 修复魂印图鉴界面销毁后再次打开报错的问题 2020-09-22 17:38:34 +08:00
jiaoyangna 9540d87893 【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失 2020-09-22 17:38:09 +08:00
jiaoyangna 51adf32101 漏提 2020-09-22 17:37:28 +08:00
zhangqiang 00287b66a6 线上问题: 大闹天宫节点例会重叠 2020-09-22 17:37:05 +08:00
jiaoyangna c5ffb7cb23 【破阵诛仙】点金达人任务,跳转点金,不计数 2020-09-22 17:36:43 +08:00
zhangqiang 24f6333726 线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改 2020-09-22 17:33:57 +08:00
zhangqiang fc97424538 线上问题 : 一键编队上阵了归元后战力低的英雄 2020-09-22 17:33:37 +08:00
JieLing 5985c0304f Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw 2020-09-22 10:36:10 +08:00
wangxiaolong 12f296aa6d 添加日志输出 2020-09-22 10:34:22 +08:00
JieLing 02b58da225 修复进入游戏报错 2020-09-21 18:26:54 +08:00
JieLing 6d8b00b5af IOS场景添加 2020-09-21 17:07:04 +08:00
JieLing c7becc2fc6 Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw 2020-09-21 17:00:53 +08:00
ZhangBiao 8ee791ab0e 修复十绝阵卡死的问题 2020-09-21 16:57:30 +08:00
wangxiaolong 68e2fda511 添加日志输出 2020-09-21 16:55:18 +08:00
gaoxin 9f75396c03 修改tapdb设置服务器数据的调用位置 2020-09-21 16:48:04 +08:00
gaoxin b77d0c9725 删除战斗资源预加载的操作,预加载的资源会导致内存泄漏。 2020-09-21 16:47:49 +08:00
JieLing 1f203f6874 修复加载到登陆加载100%卡死的问题 2020-09-21 16:47:04 +08:00
zhangqiang d8013ccd8c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-21 16:40:18 +08:00
gaoxin b3067cca48 修复切磋战斗结果只会显示失败的问题 2020-09-21 16:39:59 +08:00
JieLing 6034586a26 修复切换账号进入不同区服,会导致老账号默认区服错误的问题。 2020-09-19 16:59:56 +08:00
JieLing 6e4d1c8928 打包工具优化 2020-09-18 17:44:02 +08:00
wangxiaolong 484089cd75 添加异步资源加载日志说明 2020-09-18 14:29:50 +08:00
JieLing 600044eab5 修复跳转天宫商店会显示其他商店商品的问题 2020-09-18 13:56:36 +08:00
JieLing aca5c4683c 添加界面加载过程的日志 2020-09-18 11:29:34 +08:00
JieLing 661ee1f796 打包逻辑完善 2020-09-17 12:08:08 +08:00
wangxiaolong 385bfdbf20 添加日志输出 2020-09-16 20:45:41 +08:00
JieLing 4f4efeeea4 修复取消支付后无法再次发起支付的问题,同时取消了对网络延迟的处理 2020-09-15 18:55:33 +08:00
JieLing 2ee3e8f2c5 android打包脚本修改提交 2020-09-14 20:04:06 +08:00
JieLing 97ab62f554 添加一些出包的log 2020-09-14 18:11:55 +08:00
ljsd 639aa6c32b ios自动打包脚本提交 2020-09-14 16:20:36 +08:00
JieLing 943c04917e 将分割符换为 下划线 2020-09-14 12:59:53 +08:00
gaoxin dbb57924a6 修改透传参数consumerId 为 角色id#商品id 修复sdk支付基金不刷新的问题, 2020-09-14 11:29:58 +08:00
gaoxin 3fabc33ab6 添加用于定位商品充值成功后无法刷新界面问题的log 2020-09-12 19:32:03 +08:00
wangxiaolong 210668d51d 添加网络层log输出 2020-09-12 19:31:51 +08:00
gaoxin 807a730802 尝试修复战斗中重连偶现关卡数据丢失的问题 2020-09-12 19:31:45 +08:00
JieLing 64fdc8784a 添加一些报错打印 2020-09-12 19:31:40 +08:00
JieLing 3d594a7d8e 文字表修改 2020-09-10 14:51:20 +08:00
JieLing e18ac274db 修复sdk无法登陆的问题 2020-09-10 14:50:25 +08:00
JieLing 95c0618c33 打包工具脚本提交 2020-09-10 11:47:18 +08:00
gaoxin efc9ff9daf 修改注册打点事件,将部分静态数据放在注册之前 2020-09-09 20:40:19 +08:00
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
JieLing d440edea11 打开兑换码功能 2020-09-09 20:12:11 +08:00
zhangqiang 604de656df 巅峰赛战斗结束界面适配 2020-09-07 15:39:57 +08:00
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
altair bf38fd1ab6 修改技能图片 2020-09-07 11:54:03 +08:00
gaoxin b62fe63c84 关闭战斗log 2020-09-05 20:40:33 +08:00
gaoxin f9350d662f 分辨率小于1080*1920的背景统一放大1.2倍 2020-09-05 20:05:50 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +08:00
gaoxin 4ca09780a0 引导添加检测类型 2020-09-05 17:24:46 +08:00
gaoxin 7afe25a5d2 界面适配修改,引导添加网络延时检测 2020-09-05 17:21:09 +08:00
gaoxin 338b7b4375 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-05 16:44:07 +08:00
gaoxin 3103a4122b 设置,几天好礼界面内容修改 2020-09-05 16:43:53 +08:00
zhangqiang f8508a8663 shipei 2020-09-05 16:43:25 +08:00
gaoxin 68c9726917 屏幕适配修改 2020-09-05 16:39:10 +08:00
zhangqiang 21e7bf2e80 shi pei 2020-09-05 16:28:52 +08:00
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +08:00
zhangqiang 0d82f376b0 shi pei 2020-09-05 15:28:44 +08:00
gaoxin 37f2fd9bdf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-05 15:21:55 +08:00
gaoxin d05b5d43f1 android p 以上机型屏幕适配添加 2020-09-05 15:21:41 +08:00
zhangqiang c35058767b shi pei 2020-09-05 15:20:30 +08:00
zhangqiang 96e795c7c5 全屏界面 背景图片适配脚本 自行挂载 2020-09-05 14:22:53 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
gaoxin 92a8b93b50 修改屏幕的适配方式,修改计算屏幕位置的方法 2020-09-05 12:15:58 +08:00
zhangqiang 9937727ede Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 18:35:40 +08:00
zhangqiang 6b55198f12 周月礼包替图 2020-09-04 18:35:30 +08:00
ZhangBiao aec554c002 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 18:06:49 +08:00
ZhangBiao f6fde7a2c8 试炼副本增加动效 2020-09-04 18:04:54 +08:00
zhangqiang cbad6e10cd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:51:05 +08:00
zhangqiang bbd5d3bda2 成长基金 2020-09-04 17:50:50 +08:00
ZhangBiao 4b50f8408b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:46:35 +08:00
ZhangBiao 63cde2092d 无尽副本界面动效增加 2020-09-04 17:46:27 +08:00
gongjiawei 69a4bc320d 音频更新 2020-09-04 17:44:39 +08:00
zhangqiang f6a3178926 xiugai 2020-09-04 17:34:59 +08:00
ZhangBiao 606ecfe6b2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:33:53 +08:00
ZhangBiao 5330808e19 送神祠动效增加 2020-09-04 17:33:42 +08:00
zhangqiang 56092d5572 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:21:51 +08:00