Commit Graph

743 Commits (8a7b0dd7089795082bfbcaafcd4813c3aca94168)

Author SHA1 Message Date
ZhangBiao 52c34aa2a3 花费妖晶抽卡提示优化 2020-07-28 15:24:11 +08:00
jiaoyangna 119c4e4204 漏提 2020-07-28 15:16:04 +08:00
jiaoyangna d5b15a17ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2020-07-28 15:08:24 +08:00
zhangqiang 565d0392fc 背景颜色根据星级变化 2020-07-31 15:40:43 +08:00
zhangqiang b63e9b7e81 英雄添加按战力排序 2020-07-31 14:45:32 +08:00
jiaoyangna 99f9e7169e 添加特效 2020-07-28 15:06:47 +08:00
ZhangBiao 146197b320 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 10:42:38 +08:00
ZhangBiao ee79439f39 万象境 bug修复 2020-07-28 10:42:29 +08:00
gaoxin 48a39d2fae 游戏logo替换 2020-07-28 10:40:02 +08:00
szxhzz 2175be7bfc 配音更新 2020-07-28 10:25:46 +08:00
ZhangBiao f26718899e bug修复 2020-07-28 10:24:52 +08:00
ZhangBiao cec1f145b6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 09:48:26 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
jiaoyangna b6c2b22a3d 【日常副本优化】每个日常副本标题下方增加副本描述文字 2020-07-27 20:34:59 +08:00
jiaoyangna 18c6ad6555 carbon prefab commit 2020-07-27 20:08:23 +08:00
jiaoyangna e1ebc7c169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:48:16 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +08:00
ZhangBiao 6cff95eca9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:42:46 +08:00
ZhangBiao 66d7cc5ccc 2020-07-27 19:42:20 +08:00
szxhzz 8d6448a2bd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:17:54 +08:00
zhangqiang 5a32cb4eb6 xie yi change 2020-07-29 01:24:21 +08:00
szxhzz c02ccf8545 通用点击音效更新 2020-07-27 18:16:58 +08:00
jiaoyangna 0520ccb297 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:01:16 +08:00
jiaoyangna 40345b0ab7 十连抽提交 2020-07-27 18:00:45 +08:00
zhangqiang cf1bd66f22 预设微调 2020-07-29 00:50:13 +08:00
JieLing 64ff767121 Merge branch '接入SDK' into master_develop 2020-07-27 17:53:54 +08:00
JieLing 67914ba7dd 引导打点数据类型修改 2020-07-27 17:48:33 +08:00
ZhangBiao cbd607b479 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 17:22:23 +08:00
zhangqiang ac67088a90 背包合成不弹英雄展示 2020-07-29 00:11:36 +08:00
ZhangBiao 61aadd2cb8 跳过按钮lock大小调整 2020-07-27 17:21:16 +08:00
jiaoyangna 9abf33d1db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 16:49:24 +08:00
zhangqiang 36e18b7519 背包碎片排序 限时兑换调整预设 2020-07-28 23:40:36 +08:00
jiaoyangna 1b9f8478cc role gps star update 2020-07-27 16:49:13 +08:00
gaoxin ea7ee1141b 修复跳转充值界面后黑屏卡死的问题 2020-07-27 15:25:42 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
wangzhenxing 19a069994b 修改杨戬锤不死金翅大鹏一直锤的bug 2020-07-27 15:19:17 +09:00
gongjiawei 327cda1f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 14:21:24 +08:00
gongjiawei ffccc6d77a 音频更新 2020-07-27 14:20:50 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
ZhangBiao a53b1edd7d 元素共鸣 “已激活”字样删除 2020-07-27 11:00:08 +08:00
ZhangBiao e3eb566008 乾坤宝盒奖励概率错误修改 2020-07-27 09:59:50 +08:00
gaoxin 6bfa7d318b 注释代码 2020-07-26 17:28:44 +08:00
gaoxin eff6ee6d08 临时关闭星级成长礼显示 2020-07-26 16:44:31 +08:00
JieLing 0670160fd3 修复森罗幻境入口白片问题 2020-07-26 16:35:38 +08:00
JieLing cabc456d73 修复tapDB初始化参数错误的问题 2020-07-26 16:35:31 +08:00
gaoxin 3cd56b6ccc 修复森罗幻境底部人物星级显示错误的问题 2020-07-26 16:33:27 +08:00
gaoxin b323148076 尝试修改app安装事件在创建角色事件之后触发的问题 2020-07-26 11:14:29 +08:00
gaoxin b0503f795c 修复技能名称音效没有声音的问题 2020-07-26 11:13:25 +08:00
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
jiaoyangna b1bf2876cb 10 star update 2020-07-25 21:57:46 +08:00
zhangqiang 7f9c4f6862 提交 2020-09-13 22:25:50 +08:00
jiaoyangna 1802487345 itemview update 2020-07-25 20:56:23 +08:00
altair e98d50c3db 增加图片文件 2020-07-25 20:51:23 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
gaoxin a8abedf426 本地服务器列表请求打印添加 2020-07-25 20:37:06 +08:00
jiaoyangna 24f9860235 close supreme 2020-07-25 20:35:32 +08:00
jiaoyangna f4dc657551 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:28:46 +08:00
zhangqiang bedfcdb4f6 车迟怪物显示 2020-09-13 21:56:49 +08:00
skuld fcc1424cd5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 22:37:33 +08:00
skuld 7731aa45b8 修改猎妖之路为大闹天宫 2020-07-28 22:36:17 +08:00
jiaoyangna 46f091f09c 头像框修改提交 2020-07-25 20:28:41 +08:00
jiaoyangna 0ec835f540 获取头像框通用方法修改 2020-07-25 20:04:02 +08:00
jiaoyangna 48ff5b8b28 头像框通用方法修改 2020-07-25 20:02:24 +08:00
jiaoyangna d8fa2b9459 头像背景修改 2020-07-25 19:59:43 +08:00
gaoxin 7002d45fdc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 19:35:03 +08:00
gaoxin c56a54665c 添加服务器版本号,用于切换提审服和正式服 2020-07-25 19:34:52 +08:00
jiaoyangna 57617faa49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 19:32:02 +08:00
zhangqiang 3b11c5737a 空判断 2020-09-12 14:42:55 +08:00
jiaoyangna f511cf3380 车迟斗法挑战提交 2020-07-25 19:31:55 +08:00
gaoxin 7d9a555151 修复被动225报错 2020-07-25 19:24:29 +08:00
gaoxin 55fa5dda67 特效transform转rectTransform 2020-07-25 18:53:26 +08:00
jiaoyangna 470a89d6f3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 18:35:54 +08:00
jiaoyangna 7c92ddc60a 副本置灰修改提交 2020-07-25 18:35:05 +08:00
gaoxin 98ef2bc8be 修复获取访客id报错 2020-07-25 18:31:06 +08:00
zhangqiang 789dc39efa xiugaiyushe 2020-09-11 23:36:19 +08:00
gaoxin 2c2734ec2a 修复引导报错,修复本地测试时打点数据错误的问题 2020-07-25 18:10:05 +08:00
zhangqiang a077692c0f 关卡编队修改 2020-09-11 23:07:45 +08:00
jiaoyangna 58702c0025 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 17:24:25 +08:00
jiaoyangna e4525199d8 开启乾坤宝囊和限时召唤 2020-07-25 17:24:19 +08:00
gaoxin 28a74e529b 打点事件修改 2020-07-25 17:17:34 +08:00
gaoxin 0cca48270d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 17:09:06 +08:00
gaoxin 2947a10e03 引导打点添加,打点account字段改为字符串类型 2020-07-25 17:08:56 +08:00
jiaoyangna 8bc87ca492 按钮位置不对提交 2020-07-25 17:08:20 +08:00
zhangqiang a24c1e2016 暂时屏蔽加一种道具 2020-09-11 21:53:12 +08:00
gaoxin 3ef98155b5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 16:25:23 +08:00
zhangqiang a65257a740 剑影仙踪去掉拍脸 2020-09-11 21:37:17 +08:00
gaoxin 65756cbe59 Merge branch 'master_local_test' into master_develop
# Conflicts:
#	Assets/Effect.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MapChoose.meta
2020-07-25 16:24:48 +08:00
JieLing 543a4ca080 修复提交数据报错,内网测试0.16.2 2020-07-25 16:23:04 +08:00
gaoxin 528cd49109 Merge branch 'master_local_test' into master_develop 2020-07-25 16:21:30 +08:00
gaoxin 2b7eb6bf2a Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
#	Assets/Effect/Prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
2020-07-25 16:13:55 +08:00
gaoxin 99315ac3c6 首充引导关闭 2020-07-25 16:05:27 +08:00
gaoxin 761745dc63 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 16:02:50 +08:00
zhangqiang fe01796ded 修改 2020-09-11 21:10:39 +08:00
gaoxin 0b62abdb72 修复左右黑边的问题 2020-07-25 16:02:38 +08:00
jiaoyangna 50e50475be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 15:46:48 +08:00
gaoxin 7c47d7c6a4 攻击音效提前0.3秒 2020-07-25 15:30:33 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
JieLing 6ac8b914d5 修复登录报错 2020-07-25 15:23:10 +08:00
jiaoyangna 6742056a93 冲突解决提交 2020-07-25 15:18:07 +08:00
JieLing 6807c6c1a6 meta文件提交 2020-07-25 15:15:16 +08:00
JieLing 89169b7291 资源文件名重复 2020-07-25 14:45:27 +08:00
JieLing 5896ecee63 Merge branch 'master_develop' into master_test
# Conflicts:
#	Assets/LuaFramework/Scenes/Logo.unity
2020-07-25 14:31:52 +08:00
jiaoyangna a688050060 修改星星提交 2020-07-25 14:21:33 +08:00
zhangqiang f19188797f 英雄背景替换修改出发位置 2020-08-25 15:11:32 +08:00
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +08:00
jiaoyangna 5f556b7b5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
2020-07-25 13:22:33 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
jiaoyangna caadda04e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
2020-07-24 20:04:44 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
ZhangBiao ae1d8b4e97 2020-07-24 18:49:17 +08:00
zhangqiang a6744aaa90 替换英雄详情背景 2020-08-24 22:03:28 +08:00
zhangqiang a11919fbd9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 21:46:33 +08:00
zhangqiang abfde3e8a9 巅峰战bug and 使用按钮需求 2020-08-24 21:46:19 +08:00
ZhangBiao 4945f99452 --(24暂时关闭) 2020-07-24 18:30:26 +08:00
ZhangBiao f1755d0efa --(24暂时关闭) 2020-07-24 16:52:36 +08:00
ZhangBiao d398804a83 --(24暂时关闭) 2020-07-24 16:38:04 +08:00
ZhangBiao 7fb91910fd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 15:22:30 +08:00
ZhangBiao b3ddd8fc96 2020-07-24 15:22:17 +08:00
zhangqiang 6238892d99 巅峰赛刷新调位置 赛程增加-1 2020-08-05 21:28:16 +08:00
zhangqiang 4d0b53adf9 巅峰赛货币显示 2020-08-05 21:03:36 +08:00
ZhangBiao 0ad52a3855 活动暂时关闭 2020-07-24 13:39:02 +08:00
ZhangBiao f27300721a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 12:14:52 +08:00
ZhangBiao 1f5440c2e6 bug修复 2020-07-24 12:11:00 +08:00
zhangqiang 42959d0257 编队bug 2020-07-24 11:05:40 +08:00
jiaoyangna 667b3e0bf5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:32:45 +08:00
jiaoyangna 15976637f4 log提交 2020-07-24 10:32:27 +08:00
ZhangBiao 5edb6c9234 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:30:56 +08:00
ZhangBiao f7424e83ca 元素共鸣 2020-07-24 10:30:33 +08:00
JieLing ac344a2d99 修复tapdb用户id 2020-07-24 10:22:20 +08:00
zhangqiang dbb563fbe5 播放第三场战斗动画修改 2020-07-24 10:01:48 +08:00
zhangqiang 485c81da9f 禁止上下阵提示文字 2020-07-24 09:36:19 +08:00
zhangqiang 3fa23c25ea 修改界面id 2020-07-23 21:29:40 +08:00
zhangqiang 3588a17c00 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx
2020-07-23 21:24:00 +08:00
zhangqiang 688662836a 修改 2020-07-23 21:18:46 +08:00
JieLing 291ab0ecf7 漏掉的文件 2020-07-23 20:46:51 +08:00
zhangqiang 6a855cf7a2 巅峰赛问题修改 2020-07-23 20:39:21 +08:00
gaoxin 95cbec95e0 添加包名获取,添加账号创建打点。 2020-07-23 20:04:25 +08:00
ZhangBiao c268538c0e 共鸣资源替换 2020-07-23 19:46:54 +08:00
ZhangBiao 7b795f0daa 森罗bug 2020-07-23 19:05:43 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
ZhangBiao 259daf6a92 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 17:42:46 +08:00
ZhangBiao e0d156ad74 森罗英雄全部死亡战斗报错 2020-07-23 17:42:17 +08:00
gaoxin 3fc23499f9 获取包名方法添加 2020-07-23 17:28:01 +08:00
gaoxin 6f2a3c1c6c 新出包需求添加,sdk结构修改 2020-07-23 17:16:47 +08:00
jiaoyangna 5894babbf0 英雄献祭修改提交 2020-07-23 16:26:51 +08:00
ZhangBiao 4114a241dd 2020-07-23 16:02:11 +08:00
ZhangBiao 7fb5ac778f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:44:51 +08:00
ZhangBiao 9b290c1ed5 图片资源替换 2020-07-23 15:44:40 +08:00
jiaoyangna 4af617da49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:43:23 +08:00
jiaoyangna aefa2b0cac 添加一个万象境的入口列表 2020-07-23 15:42:42 +08:00
wangzhenxing 60b7e750a6 【ID1007274】
【技能】无敌盾应清除目标所有负面状态
2020-07-23 16:19:00 +09:00
jiaoyangna 561c3299f2 .asset commit 2020-07-23 16:05:56 +08:00
jiaoyangna 2fd0311c3c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-07-23 16:02:06 +08:00
jiaoyangna b424927bbb tupian tijiao 2020-07-23 16:01:26 +08:00
zhangqiang 3b3dbec6a7 添加巅峰赛编队 2020-07-23 14:36:28 +08:00
ZhangBiao c7da3db86d 大闹天宫打完boss不加积分问题修复 2020-07-23 13:55:12 +08:00
gaoxin 3cf3cf7e90 特效旋转功能添加 2020-07-23 13:44:03 +08:00
ZhangBiao 6f35ad19c2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 12:47:22 +08:00
ZhangBiao 207dd8e2ec 天宫秘宝刷新时间修改 2020-07-23 12:46:48 +08:00
zhangqiang 9bb7008a6d 淘汰赛战斗 可以观看多场记录 2020-07-23 12:19:45 +08:00
ZhangBiao 6e81d30a5d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 11:20:25 +08:00
ZhangBiao e266292288 关卡掉落装备显示问题修复 2020-07-23 11:19:27 +08:00
zhangqiang b53907dda2 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-07-23 11:10:19 +08:00
zhangqiang db4ffb1e95 提交 2020-07-23 11:08:11 +08:00
wangzhenxing 228d2da247 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 11:34:22 +09:00
wangzhenxing e12c485c99 添加225效果及 添加减乘运算 2020-07-23 11:34:08 +09:00
gaoxin 87b221b621 新技能特效添加 2020-07-23 10:23:33 +08:00
JieLing 346a1a5f6f Merge branch 'master_test' into master_develop 2020-07-22 22:21:29 +08:00
JieLing 256954f620 sdk修改 2020-07-22 22:12:20 +08:00
zhangqiang f844305e0e Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
2020-07-22 21:55:01 +08:00
gaoxin d6561a8c07 先后手协议添加 2020-07-22 21:39:45 +08:00
gaoxin aa16826682 战斗先后手功能添加 2020-07-22 21:24:42 +08:00
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
zhangqiang 0b747a5179 竞猜币提交 2020-07-22 19:40:23 +08:00
jiaoyangna 35012ad758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 19:07:34 +08:00
jiaoyangna f8abe77d82 归元时检测大闹天宫队伍的神将 2020-07-22 19:07:29 +08:00
szxhzz 61a841abae 音频提交 2020-07-22 18:35:53 +08:00
ZhangBiao b444d31f17 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 17:29:03 +08:00
ZhangBiao 10bb654c40 十绝阵红点刷新修复 2020-07-22 17:28:34 +08:00
jiaoyangna 2ecf69827f 归元修改提交 2020-07-22 16:31:31 +08:00
jiaoyangna be357f9268 【归元】三星卡不在归元列表显示,不能对三星的归元 2020-07-22 16:25:10 +08:00
jiaoyangna 404a0ffedb 归元报错修改 2020-07-22 16:13:25 +08:00
jiaoyangna 69f61467a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 15:57:01 +08:00
jiaoyangna ba8b5a3c93 【宝物合成】一键合成预览处显示错误 2020-07-22 15:50:18 +08:00
gaoxin 560b366938 添加前置特效转向的效果 2020-07-22 14:49:32 +08:00
ZhangBiao f1ab5780e4 切换界面黑屏问题解决 2020-07-22 14:34:00 +08:00
JieLing 932c592ea9 修改登录时注销sdk无法重新登录的问题 2020-07-22 11:42:37 +08:00
ZhangBiao 176ab5f359 2020-07-22 10:51:36 +08:00
ZhangBiao 2d79cc70e5 【战斗】解锁倍速提示,VIP改成特权 2020-07-22 10:33:31 +08:00
gaoxin abf8830744 前置特效添加全屏类型 2020-07-21 21:34:47 +08:00
ZhangBiao 934b6e8bb0 新章节未开启,奖励与地图已经更改问题修改 2020-07-21 20:20:39 +08:00
JieLing b87662e37c 去掉前端登录打点 2020-07-21 17:03:06 +08:00
gongjiawei 05496217f7 音频更新 2020-07-21 16:06:07 +08:00
ZhangBiao 8ff8920d84 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 16:04:18 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00
szxhzz 127d675497 音频更新 2020-07-21 15:39:06 +08:00
szxhzz 78634d7e04 音频更新 2020-07-21 15:05:11 +08:00
gaoxin f420ee3bd7 Merge branch 'master_develop' into 英雄技能特效添加
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ab_lzhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_axl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bah_dww01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bxxz_lhzf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chdr_qsqy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dhc_dhjf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dj_hmhx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dlsm_hskj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dm_lrzj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dst_zxtsl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dz_htjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_eh_hslc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fhlh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ft_csl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx_lrzs01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_gg_alky01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ghn_ysyn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hdxj_llhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hhe_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hsmw_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxps_xtcz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jcdp_dpzc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jgtn_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhns_ylp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhxn_wxlz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jll_yjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jls_jlsw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jmm_myjm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jw_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jy_jyh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jzy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lc_ssym01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ldb_qzjfl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ljgz_hllw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ls_lshd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lsx_swz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lzz_fjlyl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mjn_lhj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mp_lqfc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mslz_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mw_mwz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_dzcx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_pxz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_nxq_lyc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ny_qmsg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_qxn_yyw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_rd_gftm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sdxj_sbj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sgb_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sjll_bgxp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tljz_zxxzl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ts_jzlcl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tyxj_tyyq01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_wg_wgfg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xllh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yc_ycmh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygl_yll01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygps_ysqr01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yj_fjcy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ylw_pgdm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zbj_tpywl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zz_zzm01.mp3.meta
#	data_execl/base_data/CombatControl.xlsx
2020-07-21 14:48:51 +08:00
gaoxin 2d62a583c6 删除无用文件 2020-07-21 14:37:19 +08:00
ZhangBiao a07830ea52 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:36:54 +08:00
ZhangBiao 9f9f430976 道具标签不对应修改 2020-07-21 14:36:15 +08:00
gongjiawei 781a1e8453 音频更新 2020-07-21 14:24:57 +08:00
jiaoyangna 49d65fe9db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:16:46 +08:00
jiaoyangna 9fbcc3b77b 【神将】升星,需要四个三星同阵营不应该自动给选择上 2020-07-21 14:16:40 +08:00
gaoxin 528243e0ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:09:52 +08:00
ZhangBiao 3503afa84b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 12:01:53 +08:00
ZhangBiao 8ca0ecab40 2020-07-21 12:01:46 +08:00
gongjiawei 1eae262785 音频更新 2020-07-21 11:41:45 +08:00
gaoxin 0992012713 Merge branch 'master_test' into master_develop 2020-07-21 11:40:13 +08:00
gaoxin f5ed76daa1 Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test 2020-07-21 11:32:58 +08:00
gaoxin 0db4c93ef7 修复登录界面登出事件无法触发的问题 2020-07-21 11:31:26 +08:00
jiaoyangna aa86f77fea 【充值】表里配的5级,实际创角就有入口 2020-07-21 11:31:05 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
ZhangBiao d3caa3d4cf 森罗调整 2020-07-21 10:30:25 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
gaoxin 6d3338d6b1 配置修改,version文件修改 2020-07-20 20:30:49 +08:00
jiaoyangna 9b7e47aaef Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx
2020-07-20 20:00:31 +08:00
gaoxin 02b37b2d67 Merge branch 'master_develop' into master_test 2020-07-20 19:58:43 +08:00
gaoxin 42a2496ef7 修复sdk支付时界面不刷新的问题, 2020-07-20 19:57:49 +08:00
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +08:00
ZhangBiao 857d32bb96 升级礼包 剩余时间文字修改 2020-07-20 16:56:28 +08:00
ZhangBiao 4a696f3ec0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 16:42:37 +08:00
ZhangBiao 054f1558bc bug修复 2020-07-20 16:42:20 +08:00
zhangqiang f24e7cbef3 排行榜请求修改 2020-07-20 16:38:26 +08:00
zhangqiang f234c1a174 竞技场中文字修改 2020-07-20 16:07:30 +08:00
zhangqiang 99f885ac22 竞技场宝箱奖励位置可配 2020-07-20 16:01:16 +08:00
gongjiawei 4b946aa324 音頻跟新 2020-07-20 15:52:33 +08:00
gongjiawei 78717037c0 音频更新 2020-07-20 15:50:31 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
gongjiawei b2380c9b62 音频更新 2020-07-20 14:04:23 +08:00
zhangqiang c471a9ccd5 竞技场替换宝箱效果图替换 2020-07-20 11:28:19 +08:00
ZhangBiao 97bfdd53b6 十绝阵开启阶段加入公会不可挑战十绝阵 2020-07-20 11:21:16 +08:00
ZhangBiao 43f7ca10bc 2020-07-20 11:02:40 +08:00
ZhangBiao f9ecb13bd3 战斗跳过按钮 2020-07-20 10:40:55 +08:00
ZhangBiao 055c5f6926 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 10:02:21 +08:00
ZhangBiao c0d053c65c 免费抽刷新时间 2020-07-20 10:02:12 +08:00
jiaoyangna b11c108e5d Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-20 09:47:28 +08:00
gaoxin 5c962f330a Merge branch '接入SDK' into master_test
# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset
2020-07-18 19:55:02 +08:00
gaoxin 90e9548549 ext字段修改 2020-07-18 19:48:39 +08:00
gaoxin a1acdd13fb 支付接口接入,打点数据完善 2020-07-18 19:24:19 +08:00
zhangqiang c6b5321424 bug 2020-07-17 20:52:44 +08:00
zhangqiang 480e810478 添加文字 2020-07-17 20:06:48 +08:00
zhangqiang a8427d034c 字体修改 2020-07-17 19:48:25 +08:00
zhangqiang 57981fc393 字体修改 2020-07-17 19:36:23 +08:00
JieLing af9f316417 Merge branch 'master_develop' into master_test 2020-07-17 18:29:48 +08:00
jiaoyangna 0715821074 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 18:20:41 +08:00
jiaoyangna 9876ec5f5a 红点检测修改 2020-07-17 18:20:31 +08:00
gongjiawei 05fe46a84e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 18:06:24 +08:00
gongjiawei 3c6db51497 音频更新 2020-07-17 18:06:10 +08:00