Commit Graph

307 Commits (8c17479fd6d14b4bb7c378334690f19547aeec48)

Author SHA1 Message Date
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
jl_ios 8be4e2745b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 12:43:03 +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
jl_ios 02b7e07d20 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +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
jiaoyangna c328d4683c 特效添加提交 2020-07-30 10:08:58 +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
altair 5af034b02d 修改技能特效 2020-07-29 17:43:54 +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
altair 2e046d4d74 修改特效 2020-07-28 18:22:11 +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
gaoxin 5f6783fc13 新通用被击特效提交 2020-07-28 16:30:03 +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