Commit Graph

529 Commits (c47507f128dcee3d21f5810d8a2a5a263e55609d)

Author SHA1 Message Date
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 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 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 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 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
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
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
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +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
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
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
gaoxin 0992012713 Merge branch 'master_test' into master_develop 2020-07-21 11:40:13 +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
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
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +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
jiaoyangna 9876ec5f5a 红点检测修改 2020-07-17 18:20:31 +08:00
jiaoyangna b56682cafd 5点刷新添加一个特权id 2020-07-17 18:04:37 +08:00
zhangqiang 19046587e4 竞猜结果修改 2020-07-17 17:59:46 +08:00
gaoxin b099f0e251 数据打点静态数据添加 2020-07-17 17:50:05 +08:00
jiaoyangna 3f576bbf3e 首充战斗换id 2020-07-17 17:40:30 +08:00
gaoxin 4e67a3f0bc 修复挂机界面黑边为题 2020-07-17 15:55:20 +08:00
zhangqiang 264f0b7323 bug 2020-07-17 15:14:15 +08:00
ZhangBiao 064ad3b8b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:40:43 +08:00
ZhangBiao b20e5e2f54 十绝阵伤害显示调整 2020-07-17 14:40:33 +08:00
jiaoyangna e63fb9e0cf 修改文字 2020-07-17 14:35:38 +08:00
jiaoyangna 068980325a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:15:56 +08:00
jiaoyangna 7faa067c52 宝物分解提交 2020-07-17 14:15:42 +08:00
zhangqiang 98670958a0 首冲拍脸 寻宝红点条件 2020-07-17 13:56:30 +08:00
ZhangBiao 63b8b36a37 剔除logo等信息 2020-07-17 13:38:02 +08:00
gaoxin 76d00dce34 支付接口调试 2020-07-17 11:39:24 +08:00
jiaoyangna d1fd538542 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 11:38:26 +08:00
jiaoyangna 96c16ca7f8 去掉log 2020-07-17 11:38:18 +08:00
zhangqiang 25896729ff 商店去掉刷新红点 2020-07-17 11:32:20 +08:00
zhangqiang ebca764861 首冲 2020-07-17 11:27:03 +08:00
jiaoyangna adc5895d94 首充十级英雄属性天赋错误修改提交 2020-07-17 11:16:44 +08:00
jiaoyangna 3ae13a9762 首充英雄十级属性天赋修改提交 2020-07-17 11:14:07 +08:00
zhangqiang 897b14aa65 巅峰战提交 2020-07-17 10:28:02 +08:00
ZhangBiao bfe29c5601 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-16 20:55:34 +08:00
ZhangBiao 3231f857af 工会祭祀援助红点、十绝阵排行修改 2020-07-16 20:53:17 +08:00
gaoxin 542c76916d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 20:43:23 +08:00
gaoxin 3152ff0f41 修复部分技能报错的问题 2020-07-16 20:43:11 +08:00
jiaoyangna 3ae65767d0 幸运探宝, 2020-07-16 20:36:54 +08:00
jiaoyangna 1838823c37 幸运探宝提交 2020-07-16 20:24:28 +08:00
gaoxin d8b88221da 修复中心全屏特效显示错误的问题 2020-07-16 20:23:11 +08:00
gaoxin 7a7446f145 sdk可以正常登录了 2020-07-16 19:51:38 +08:00
jiaoyangna 47a1c94495 game_17 2020-07-16 18:45:58 +08:00
gaoxin 958caebcb1 添加技能特效效果5 屏幕中心的全屏特效 2020-07-16 18:06:06 +08:00
zhangqiang 8f96d9f067 探宝红点 2020-07-16 18:01:03 +08:00
ZhangBiao a27c474098 协议 2020-07-16 17:28:48 +08:00
gaoxin 5b7b28f1f9 sdk接入结构修改 2020-07-16 17:00:24 +08:00
ZhangBiao 0ee5c9dabe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 17:00:06 +08:00
ZhangBiao cb56ec6b22 森罗小游戏bug修改 2020-07-16 16:59:46 +08:00
zhangqiang 864e3b739d 首冲 2020-07-16 16:57:36 +08:00
JieLing abde9c93bf casting音效播放添加 2020-07-16 16:52:43 +08:00
zhangqiang 1aa78a2dd7 戴峰提交 2020-07-16 15:52:19 +08:00
zhangqiang 85663ecfb4 首冲 2020-07-16 15:02:38 +08:00
zhangqiang 6fbed83b28 巅峰赛修改提交 2020-07-16 14:13:27 +08:00
ZhangBiao afa02aae2e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 13:45:50 +08:00
ZhangBiao 9d47ce9767 小游戏bug修复 2020-07-16 13:45:07 +08:00
jiaoyangna c282e19b5e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 10:49:10 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
JieLing 9f6fa391c4 删除战斗音效加速的效果 2020-07-16 10:22:51 +08:00
zhangqiang 2c744690bc 赛程数据合并 2020-07-16 10:13:32 +08:00
zhangqiang bdf9331b79 巅峰战提交 2020-07-15 18:23:40 +08:00
ZhangBiao cbe238fc9d 跳过战斗特权 修改 2020-07-15 17:33:19 +08:00
ZhangBiao 18c189cd0c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 16:36:52 +08:00
ZhangBiao de9290e4a0 物品掉落特效+跳过按钮 2020-07-15 16:35:51 +08:00
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
ZhangBiao fc4e2c35ff bug修改 2020-07-15 14:50:00 +08:00
gaoxin 7605156317 sdk结构修改 2020-07-15 13:44:37 +08:00
ZhangBiao 9e23f56e00 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 13:41:44 +08:00
ZhangBiao 9f59d1f574 森罗幻境 小游戏与效果图的差异修改 2020-07-15 13:41:29 +08:00
zhangqiang ed5a942875 探宝红点未完成 2020-07-15 13:34:13 +08:00
ZhangBiao de81c1f5c2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-15 11:15:41 +08:00
ZhangBiao 10414deee5 领取挂机宝箱时,增加道具获取动画效果 修改 2020-07-15 11:15:29 +08:00
jiaoyangna ee95a1ee55 【探宝优化】增加每日探宝次数限制 2020-07-15 11:07:32 +08:00
zhangqiang b682f97e66 首充第一版修改 2020-07-15 10:36:57 +08:00
ZhangBiao 2ab6d17841 森罗小游戏修改 2020-07-14 21:03:44 +08:00
zhangqiang f3048c9904 巅峰赛 修改 2020-07-14 20:27:23 +08:00
jiaoyangna 5a3e8f8b1b 乾坤宝盒红点显示 2020-07-16 09:02:59 +08:00
jiaoyangna 0d82750315 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-14 16:14:13 +08:00
jiaoyangna 1d9d318cb5 【限时召唤】只有第一次免费召唤有红点,刷新免费次数后,主城入口,限时召唤页签上不显示红点 2020-07-14 16:14:03 +08:00
zhangqiang 4968389a68 援助红点 2020-07-14 16:06:19 +08:00
jiaoyangna f54529ce21 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-14 15:54:47 +08:00
jiaoyangna 798c730f56 公会红点显示, 2020-07-14 15:54:18 +08:00
zhangqiang 592d3385e8 129 战力计算 2020-07-14 14:49:15 +08:00
ZhangBiao e9b2845315 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-14 14:03:20 +08:00
ZhangBiao 7785a7c472 神将生阶属性显示错误问题修复 2020-07-14 14:03:08 +08:00
jiaoyangna 15dd908ace 【ID1008354】
【公会祭祀】在原公会祭祀,加新公会,进度奖励不能领取,不需要显示红点
2020-07-14 13:55:41 +08:00
ZhangBiao 6d3faec09e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-14 11:43:46 +08:00
ZhangBiao 06e87b8c66 bug修改 2020-07-14 11:43:30 +08:00
gaoxin 59a9f073ac Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-14 11:40:01 +08:00
gaoxin fb4891d005 修复打开关卡界面报错的问题 2020-07-14 11:39:56 +08:00
ZhangBiao 39bd3e8523 限时召唤ui调整 2020-07-14 11:34:40 +08:00
ZhangBiao eddaa95312 宝囊 2020-07-14 11:05:47 +08:00
zhangqiang 7d724437ee 巅峰战提示等待其他玩家战斗结束提交 2020-07-14 10:12:07 +08:00
jiaoyangna 791af67033 【公会祭祀】祭祀进度条显示不准确 2020-07-13 20:47:11 +08:00
ZhangBiao 4c6369e51d 乾坤宝囊修改 2020-07-13 20:07:06 +08:00
jiaoyangna 0b26bb33c6 归元修改 2020-07-13 18:31:39 +08:00
jiaoyangna 96316f4b39 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 18:21:16 +08:00
gaoxin 48fc5c61fb 取消背景音乐加速 2020-07-13 18:01:58 +08:00
gaoxin a37151646a 战斗音效播放速度随战斗速度变化 2020-07-13 17:53:15 +08:00
jiaoyangna 889d3abf68 【送神祠】归元,点敖丙报错 2020-07-13 17:32:24 +08:00
jiaoyangna d2f25e1845 归元修改 2020-07-13 17:12:46 +08:00
gaoxin 240818a620 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 16:49:11 +08:00
gaoxin db1118aa9c 修复打包后不能充值得bug 2020-07-13 16:48:50 +08:00
jiaoyangna ff2e9aaaa3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 16:47:28 +08:00
jiaoyangna d16ecd259a 【公会】公会成员信息点开报错 2020-07-13 16:46:59 +08:00
ZhangBiao 1645736a5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 16:41:50 +08:00
ZhangBiao 416ba72c2f 森罗小游戏bug修改 2020-07-13 16:41:35 +08:00
jiaoyangna f80ac29435 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 16:23:01 +08:00
jiaoyangna b2c9b88991 【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解 2020-07-13 16:16:56 +08:00
zhangqiang bc270de90d 提交 2020-07-13 15:39:29 +08:00
zhangqiang 926ff911da 一键上阵修改 2020-07-13 15:08:32 +08:00
jiaoyangna 3953a76280 【宝物】一键装备替下来的,不在背包显示 2020-07-13 15:00:07 +08:00
gaoxin eba4b7cf50 shader引用文件提交 2020-07-13 13:38:34 +08:00
gaoxin bd83a45de2 Merge branch 'master_test' into 接入SDK
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Audio/Skill/actor_voc.meta
#	Assets/ManagedResources/PublicArtRes/Models/Materials.meta
#	Assets/ManagedResources/~Lua/Config/Data.meta
2020-07-13 12:55:15 +08:00
gaoxin 3f54c121b1 sdk=接口完善 2020-07-13 12:25:55 +08:00
jiaoyangna 40fa614a52 限时召唤】点十连,单抽的免费不显示了 2020-07-13 12:01:39 +08:00
jiaoyangna 6ff6b5315b 分解、重置相关功能修改 2020-07-13 11:15:53 +08:00
zhangqiang 9dfb75b169 竞猜币 2020-07-11 18:40:16 +08:00
jiaoyangna fdf82e47ac 分解、重置相关功能修改 2020-07-11 18:00:07 +08:00
zhangqiang 4edc074ca3 抛弹竞猜结束 打开 ATM_GuessTipView时机修改 2020-07-11 17:16:14 +08:00
gaoxin 8be0056346 技能名称音效添加 2020-07-11 16:26:33 +08:00
jiaoyangna 106a7f7763 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
2020-07-11 16:25:30 +08:00
jiaoyangna 0fb81547d3 分解提交 2020-07-11 16:21:15 +08:00
zhangqiang 28f2a1c4f4 去掉每秒刷新赔率 2020-07-11 16:04:39 +08:00
gaoxin f96f07865f meta文件提交 2020-07-11 15:45:39 +08:00
gaoxin 5c1e235228 技能名称音效添加 2020-07-11 15:42:56 +08:00
ZhangBiao 310802e967 language导出 2020-07-10 19:13:29 +08:00
ZhangBiao 7279a7edd1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 19:03:03 +08:00
ZhangBiao 3ab971eaea 宝囊红点 2020-07-10 19:02:54 +08:00
jiaoyangna 3a85c6e339 分解,限时召唤提交 2020-07-10 18:29:38 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00
ZhangBiao b89c0582c0 宝囊 2020-07-10 17:55:11 +08:00
zhangqiang 4a0ee0c3dc 巅峰赛打印提交 2020-07-10 15:16:50 +08:00
zhangqiang 13283fe135 巅峰战提交 2020-07-10 13:38:50 +08:00
gaoxin 465ca19e84 sdk相关文档提交 2020-07-10 09:59:56 +08:00
2han9B1a0 ce1d7014f3 2020-07-09 19:59:23 +08:00
2han9B1a0 12b0fa9f73 特权修改,宝囊商店 2020-07-09 18:20:53 +08:00
2han9B1a0 f158fa6536 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 16:14:56 +08:00
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
gaoxin 6303805bfa 修复未命中时报错的问题 2020-07-09 15:18:02 +08:00
jiaoyangna c3e1aaff6e 【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
2020-07-09 13:35:59 +08:00
2han9B1a0 8e853b2758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 11:53:10 +08:00
2han9B1a0 47b34f9d6e 宝囊 2020-07-09 11:52:40 +08:00
jiaoyangna f9c49d00e3 宝物bug修改 2020-07-09 10:53:15 +08:00
jiaoyangna 37c7c839c4 限时召唤提交 2020-07-09 10:04:20 +08:00
zhangqiang 6bdc5a1db8 巅峰战竞猜记录显示 2020-07-08 21:38:36 +08:00
gaoxin 3e43ea4876 Merge branch '优化cardrenderer' into master_develop 2020-07-08 21:23:04 +08:00
gaoxin b5ab2384c3 优化rendertexture的数量20->6 2020-07-08 21:21:49 +08:00
2han9B1a0 12d9208f90 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 21:19:49 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
2han9B1a0 39d035b21a no message 2020-07-08 21:09:45 +08:00
zhangqiang 0b40fda687 巅峰战 2020-07-08 20:48:43 +08:00
gaoxin ce13a0263e Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta
2020-07-08 19:55:09 +08:00
jiaoyangna 21778b4a74 限时提交 2020-07-08 19:16:04 +08:00
gaoxin da6bb67d50 技能配置优化 2020-07-08 18:23:12 +08:00
2han9B1a0 d5bc2b4ef1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 16:24:27 +08:00
jiaoyangna 9b138fe566 限时召唤提交 2020-07-08 16:23:04 +08:00
2han9B1a0 1b89e68c95 包囊 2020-07-08 16:23:02 +08:00
jiaoyangna 070fb43964 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
2020-07-08 16:20:26 +08:00
jiaoyangna 1df7a8006a 【ID1008244】
【限时招募】阶段奖励进度条显示不准
2020-07-08 16:19:46 +08:00
zhangqiang b3dc6d0688 巅峰赛 2020-07-08 15:02:16 +08:00
2han9B1a0 51089bd2c8 福利界面报错 2020-07-08 11:46:43 +08:00