Commit Graph

478 Commits (7afe25a5d23ae5cba03bc2db914897ecc7fcef58)

Author SHA1 Message Date
ZhangBiao 52dda5ff47 青龙入口 破阵长度 2020-08-21 19:03:41 +08:00
jiaoyangna cbd8b9c084 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 18:33:09 +08:00
jiaoyangna 2646f9418a 2020-08-28 18:32:59 +08:00
jiaoyangna 66556e506a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 11:33:24 +08:00
jiaoyangna 22de98dc18 commit 2020-08-28 11:31:38 +08:00
jiaoyangna e4a9c5c614 qinglong update 2020-08-28 11:05:31 +08:00
ZhangBiao 7058d73193 破阵诛仙 提交 2020-08-21 18:30:44 +08:00
zhangqiang 0759809be9 公会副本提交 2020-08-21 18:22:53 +08:00
zhangqiang b725617a8d 公会副本提交 2020-08-21 15:52:49 +08:00
ZhangBiao 7ae97fdff0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-21 11:24:02 +08:00
ZhangBiao b8a8a3980c 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
zhangqiang c08c537b16 公会副本提交 2020-08-20 20:05:38 +08:00
jiaoyangna 948f47398c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-20 17:36:31 +08:00
jiaoyangna 6b0af3d7fb pozhenzhuxian commit 2020-08-20 17:36:19 +08:00
ZhangBiao b650ba81e8 界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
2020-08-20 16:48:30 +08:00
ZhangBiao b01a3f31f9 Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/MonsterGroup.xlsx
2020-08-20 15:00:23 +08:00
jiaoyangna d1a4bff97e chengjiu update 2020-08-19 20:10:48 +08:00
jiaoyangna 785590bd4f 五星成长礼提交 2020-08-19 22:11:48 +08:00
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
ZhangBiao 7e4b73dc27 两个副本,基本成型了 2020-08-18 21:03:55 +08:00
zhangqiang c6b0acb7d8 Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
2020-08-18 19:36:17 +08:00
zhangqiang 00f1060be7 公会副本提交初始界面 2020-08-18 19:33:31 +08:00
jiaoyangna 95593175ec dailycarbonpanel update 2020-08-18 14:00:03 +08:00
zhangqiang c67951f5fb 公会副本资源提交 2020-08-17 16:19:25 +08:00
zhangqiang cdf78a9dcf 剑影仙踪资源提交 2020-08-17 15:59:33 +08:00
zhangqiang 6df142b067 修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏 2020-08-17 11:39:41 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
jiaoyangna d97203bf0b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 21:05:30 +08:00
jiaoyangna 740eb7253d xuanyuan commit 2020-08-14 20:41:07 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing ad3ee94a75 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
jiaoyangna 40b9550c54 修改轩辕副本立绘提交 2020-08-14 14:35:48 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
wangzhenxing 9dce11a6eb 测试战斗修改提交 2020-08-13 17:36:20 +09:00
wangzhenxing 442877d3e0 珍奇宝阁预设代码提交 2020-08-13 16:38:20 +09:00
jiaoyangna fbf7c3b41d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:44:53 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
ZhangBiao d1ec3fa196 每周 每月礼包阴影问题修复 2020-08-13 13:33:48 +08:00
ZhangBiao 2fe27c64ec 2020-08-13 12:33:21 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
jiaoyangna 8c27eecbf6 xuanyuan update 2020-08-12 14:30:55 +08:00
jiaoyangna 95dff6f0e9 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-08-12 14:20:45 +08:00
jiaoyangna 96d47d34a8 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
2020-08-12 14:17:01 +08:00
ZhangBiao 06bc9c1f1d Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-12 14:15:27 +08:00
jiaoyangna 7bee1280b3 xuanyuan update 2020-08-12 14:13:28 +08:00
ZhangBiao ed319be87e 神将置换 2020-08-12 14:13:16 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
ZhangBiao c1c013a007 神将置换 基本功能完成 2020-08-11 20:55:05 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
jiaoyangna f7fe1d9513 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	data_execl/base_data/GlobalActivity.xlsx
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
2020-08-11 14:07:10 +08:00
jiaoyangna 6f05841519 no message 2020-08-11 11:00:30 +08:00
jiaoyangna dc058f99e1 no message 2020-08-11 10:13:50 +08:00
jiaoyangna 3d2f288934 轩辕宝镜提交 2020-08-11 09:48:21 +08:00
zhangqiang 6dd95ec834 神将合成部分显示代码 2020-08-08 11:06:01 +08:00
zhangqiang f2d743a343 英雄合成预设更新 2020-08-07 14:23:05 +08:00
ZhangBiao f09a0448bc 2020-08-07 10:34:18 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
jiaoyangna c095459166 no message 2020-08-05 21:01:20 +08:00
ZhangBiao eeaa1f26f8 2020-08-05 19:18:15 +08:00
ZhangBiao 879331e416 森罗炸弹数量刷新,奖励和generalpanel界面适配 2020-08-05 18:02:47 +08:00
ZhangBiao a1b9ca69f6 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-05 17:16:30 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao d72d87d497 2020-08-05 17:16:06 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
jiaoyangna 7d5efc523e 图鉴修改提交 2020-08-05 16:04:06 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
jiaoyangna 802286d743 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:41:22 +08:00
jiaoyangna e9438df1b7 图鉴优化 2020-08-04 18:41:17 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
ZhangBiao 24381aba57 森罗bug修复 2020-08-04 16:18:48 +08:00
jiaoyangna 54aae5181f fix bug 2020-08-03 15:51:48 +08:00
jiaoyangna 89dbd09856 resolve hero tails update 2020-08-03 10:32:20 +08:00
jiaoyangna 8b3bcecb59 activity commit 2020-08-03 10:18:04 +08:00
jiaoyangna 7a0848100a resolve hero tails update 2020-07-31 18:36:54 +08:00
zhangqiang 93c1913a73 适配修改 2020-08-19 03:31:43 +08:00
gaoxin c2f436a3d6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:28:19 +08:00
gaoxin 056fbe171e loading界面资源替换 2020-07-31 16:28:13 +08:00
zhangqiang fc7552f55f 车迟抢夺玩家人物头像属性修改 四元阵修改预设文字 2020-08-19 02:25:01 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00
zhangqiang 39083460c1 献祭坛适配 2020-08-18 21:54:30 +08:00
ZhangBiao 44ace7a129 充值入口恢复 2020-07-31 10:33:05 +08:00
ZhangBiao bff0e3a1ee 2020-07-31 10:09:25 +08:00
ZhangBiao a7d0f4e522 八日登陆 特效修改 2020-07-31 10:00:56 +08:00
jiaoyangna df84dd8577 mubiaojaingli effect update 2020-07-30 17:01:33 +08:00
jiaoyangna 1b2a752871 effect update 2020-07-30 16:37:58 +08:00
jiaoyangna ca080676df Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 16:03:37 +08:00
jiaoyangna 0146c814ee effectprefab update 2020-07-30 16:03:30 +08:00
jiaoyangna d00afc69cf 添加特效 2020-08-06 15:14:47 +08:00
gaoxin 9ab747a189 屏幕适配修改 2020-07-30 15:49:20 +08:00
gaoxin 58728fa555 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:01:00 +08:00
zhangqiang ce7c70820b 界面适配 跳转竞技场进攻阵容检测 2020-08-15 19:02:20 +08:00
gaoxin c5f6b68906 rendertexture优化修改 2020-07-30 14:00:55 +08:00
ZhangBiao ee4ecf49c2 森罗环境 炸弹 终于完了 2020-07-29 20:18:19 +08:00
gaoxin 2e5b87250b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 18:05:45 +08:00
gaoxin d9a26568e4 添加战斗日志上报功能 2020-07-29 18:05:40 +08:00
jiaoyangna b9084626eb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:51:40 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
zhangqiang b2a54634d2 适配调整 巅峰赛入口 2020-08-15 00:08:25 +08:00
ZhangBiao 97b7118e11 2020-07-28 22:05:24 +08:00
ZhangBiao ecfe1f5e33 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:14:40 +08:00
ZhangBiao 8c7b24ad9a bug修复 2020-07-28 20:13:09 +08:00
jiaoyangna a3298ae117 星星预设提交 2020-07-28 19:21:16 +08:00
jiaoyangna 8a2a443168 星星提交 2020-07-28 19:18:45 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
ZhangBiao 88effd78f1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:26:50 +08:00
ZhangBiao 6c316bf7de 2020-07-28 17:25:50 +08:00
gaoxin 2df9b068b9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:24:15 +08:00
ZhangBiao 771826da9c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:01:58 +08:00
ZhangBiao 018adbe85d 天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗 2020-07-28 17:01:48 +08:00
gaoxin 5d6586a9a5 部分界面适配修改 2020-07-28 17:00:19 +08:00
jiaoyangna 60bf046b81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:54:43 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
ZhangBiao 1868a14b08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 15:24:21 +08:00
ZhangBiao 52c34aa2a3 花费妖晶抽卡提示优化 2020-07-28 15:24:11 +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
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
zhangqiang cf1bd66f22 预设微调 2020-07-29 00:50:13 +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
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
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
ZhangBiao a53b1edd7d 元素共鸣 “已激活”字样删除 2020-07-27 11:00:08 +08:00
gaoxin 3cd56b6ccc 修复森罗幻境底部人物星级显示错误的问题 2020-07-26 16:33:27 +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 bedfcdb4f6 车迟怪物显示 2020-09-13 21:56:49 +08:00
jiaoyangna f511cf3380 车迟斗法挑战提交 2020-07-25 19:31:55 +08:00
zhangqiang 789dc39efa xiugaiyushe 2020-09-11 23:36:19 +08:00
zhangqiang a65257a740 剑影仙踪去掉拍脸 2020-09-11 21:37:17 +08:00
jiaoyangna 6742056a93 冲突解决提交 2020-07-25 15:18:07 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
jiaoyangna a688050060 修改星星提交 2020-07-25 14:21:33 +08:00
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +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
zhangqiang abfde3e8a9 巅峰战bug and 使用按钮需求 2020-08-24 21:46:19 +08:00
ZhangBiao 0ad52a3855 活动暂时关闭 2020-07-24 13:39:02 +08:00
zhangqiang 42959d0257 编队bug 2020-07-24 11:05: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
zhangqiang 6a855cf7a2 巅峰赛问题修改 2020-07-23 20:39:21 +08:00
ZhangBiao c268538c0e 共鸣资源替换 2020-07-23 19:46:54 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
ZhangBiao e0d156ad74 森罗英雄全部死亡战斗报错 2020-07-23 17:42:17 +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 aefa2b0cac 添加一个万象境的入口列表 2020-07-23 15:42:42 +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 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
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
jiaoyangna ba8b5a3c93 【宝物合成】一键合成预览处显示错误 2020-07-22 15:50:18 +08:00
ZhangBiao 9f9f430976 道具标签不对应修改 2020-07-21 14:36:15 +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
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +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
jiaoyangna b11c108e5d Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-20 09:47:28 +08:00
zhangqiang 57981fc393 字体修改 2020-07-17 19:36:23 +08:00
zhangqiang 6e59d44e5a 先屏蔽宝器一键合成 2020-07-17 16:40:38 +08:00
ZhangBiao 2db96229ca 战斗跳过按钮大小调整 2020-07-17 16:05:39 +08:00
ZhangBiao b20e5e2f54 十绝阵伤害显示调整 2020-07-17 14:40:33 +08:00
ZhangBiao 058d079190 18岁 2020-07-17 13:58:22 +08:00
ZhangBiao 63b8b36a37 剔除logo等信息 2020-07-17 13:38:02 +08:00
ZhangBiao 3231f857af 工会祭祀援助红点、十绝阵排行修改 2020-07-16 20:53:17 +08:00
jiaoyangna 1838823c37 幸运探宝提交 2020-07-16 20:24:28 +08:00
ZhangBiao e36a85bcb2 充点小钱资源替换 2020-07-16 18:17:27 +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
zhangqiang 1aa78a2dd7 戴峰提交 2020-07-16 15:52:19 +08:00
zhangqiang 85663ecfb4 首冲 2020-07-16 15:02:38 +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 adc3b71e40 分解修改提交 2020-07-16 10:49:01 +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 9497cfae78 bug修改 2020-07-15 15:03:23 +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
ZhangBiao 06e87b8c66 bug修改 2020-07-14 11:43:30 +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
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 b2c9b88991 【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解 2020-07-13 16:16:56 +08:00
jiaoyangna 0fb81547d3 分解提交 2020-07-11 16:21:15 +08:00
jiaoyangna 3a85c6e339 分解,限时召唤提交 2020-07-10 18:29:38 +08:00
ZhangBiao b89c0582c0 宝囊 2020-07-10 17:55:11 +08:00
2han9B1a0 ce1d7014f3 2020-07-09 19:59:23 +08:00
2han9B1a0 12b0fa9f73 特权修改,宝囊商店 2020-07-09 18:20:53 +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 37c7c839c4 限时召唤提交 2020-07-09 10:04:20 +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
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 7e1e15f8af 报错修改 2020-07-08 17:03:34 +08:00
jiaoyangna 1df7a8006a 【ID1008244】
【限时招募】阶段奖励进度条显示不准
2020-07-08 16:19:46 +08:00
zhangqiang b3dc6d0688 巅峰赛 2020-07-08 15:02:16 +08:00
2han9B1a0 4aed395ed3 乾坤包囊 2020-07-08 09:40:36 +08:00
zhangqiang bff7df21e4 装备出售界面添加 2020-07-07 15:20:43 +08:00
2han9B1a0 bdc2c095a7 点将台奖池修改 2020-07-07 14:16:28 +08:00
2han9B1a0 8eaa1f6e8c 增加 图鉴、神将归元、恭送神将界面“全部”按钮 2020-07-07 10:57:23 +08:00
zhangqiang 105d3bf53e 宝器分解计算掉落 2020-07-06 19:11:15 +08:00
2han9B1a0 b0bee3f1d7 神将界面“全部”按钮 2020-07-06 18:37:29 +08:00
2han9B1a0 9c698254a7 删除 英雄、战斗界面的特权显示 2020-07-06 17:10:49 +08:00
2han9B1a0 e3c9fb459e 寻宝文字提示修改,特权界面资源替换 2020-07-06 17:01:50 +08:00