Commit Graph

351 Commits (e9bd44d6d768b7b6516589e41e2164ba8d088536)

Author SHA1 Message Date
gaoxin b1f7318f11 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:18:36 +08:00
gaoxin 02c213aca8 挂机地图新增 2020-08-24 17:17:21 +08:00
ZhangBiao ec6cf58003 天尊降世入口资源替换 2020-08-24 17:04:45 +08:00
ZhangBiao 4b59561b3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
2020-08-24 16:08:01 +08:00
ZhangBiao 6013365ad1 剑影仙踪特效更新 2020-08-24 16:07:08 +08:00
gaoxin d7c34ec63d 创建角色界面立绘位置调整 2020-08-24 16:03:21 +08:00
gaoxin 395c41ef79 Merge branch 'temp' into master_develop 2020-08-24 14:36:54 +08:00
gaoxin 74951cedd8 修复登录界面错误,修复战斗背景音乐缺失的问题 2020-08-24 14:35:45 +08:00
jiaoyangna 7419c97899 限时折扣刷新update 2020-08-24 10:22:27 +08:00
jiaoyangna 0f90bbe3fb 副本预设修改 2020-08-24 10:07:16 +08:00
zhangqiang 35899a49a4 公会副本调整 红点判断 2020-08-22 21:43:58 +08:00
jiaoyangna 4604d95f9d qinglong commit 2020-08-22 21:20:12 +08:00
jiaoyangna 887329a458 hondian 2020-08-22 20:57:19 +08:00
gaoxin 4f8026425d sdk添加上传新手数据的接口 2020-08-22 19:14:58 +08:00
zhangqiang 44a2538eb3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2020-08-22 18:06:08 +08:00
zhangqiang 8f72af20cc 公会副本提交 达人排行修改 2020-08-22 18:03:43 +08:00
jiaoyangna 04bf990060 qinglong tijiao 2020-08-22 17:36:57 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
jiaoyangna 98e9b9757e huodong commit 2020-08-29 13:46:08 +08:00
zhangqiang b279baaa41 公会副本提交 2020-08-22 13:49:47 +08:00
ZhangBiao 7f0d404e5d 添加一键购买、礼包界面计时器销毁 2020-08-22 10:09:30 +08:00
ZhangBiao 1a826a3f3e 累计充值 2020-08-21 20:11:24 +08:00
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