Commit Graph

273 Commits (e86078ce69db29e10feb70a788e1bb971de9e408)

Author SHA1 Message Date
jiaoyangna f3aca22b37 commit help_type 2020-08-25 11:38:23 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
gaoxin e806410e8a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-24 15:25:23 +08:00
ZhangBiao 939fa0227a 无尽入口例会、化虚进入修复、剪影仙踪 2020-08-24 15:20:00 +08:00
gaoxin 395c41ef79 Merge branch 'temp' into master_develop 2020-08-24 14:36:54 +08:00
jiaoyangna aebf37e150 云梦祈福提交 2020-08-22 20:26:11 +08:00
gaoxin 4f8026425d sdk添加上传新手数据的接口 2020-08-22 19:14:58 +08:00
zhangqiang 8f72af20cc 公会副本提交 达人排行修改 2020-08-22 18:03:43 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
zhangqiang 9aec7d16e8 公会副本提交 2020-08-22 15:34:02 +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
zhangqiang b279baaa41 公会副本提交 2020-08-22 13:49:47 +08:00
ZhangBiao bbe2c8c1f3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-21 18:30:50 +08:00
jiaoyangna 8c17479fd6 破阵诛仙活动 调整 2020-08-28 17:46:07 +08:00
jiaoyangna 3bb8e284d9 破阵诛仙 2020-08-28 16:36:08 +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
ZhangBiao 7058d73193 破阵诛仙 提交 2020-08-21 18:30:44 +08:00
ZhangBiao b8a8a3980c 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
zhangqiang c08c537b16 公会副本提交 2020-08-20 20:05:38 +08:00
ZhangBiao aa551923b1 破阵诛仙 珍奇宝阁 2020-08-20 18:32:14 +08:00
jiaoyangna 6b0af3d7fb pozhenzhuxian commit 2020-08-20 17:36:19 +08:00
jiaoyangna 6c52db4ec6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-20 16:08:18 +08:00
jiaoyangna 2eaa10cdbc 添加红点 2020-08-20 16:08:12 +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
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
jiaoyangna f439a78b34 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-19 10:05:09 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
ZhangBiao f18973cea9 极速达人修改 2020-08-18 19:17:20 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
jiaoyangna 17524007d7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 15:18:03 +08:00
jiaoyangna 0210dc3109 conflict commit 2020-08-17 15:17:58 +08:00
ZhangBiao 77b3386efb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 11:57:01 +08:00
ZhangBiao c2fdcb06bd 极速达人 2020-08-17 11:56:38 +08:00
zhangqiang 6df142b067 修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏 2020-08-17 11:39:41 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08: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
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +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
ZhangBiao 06bc9c1f1d Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-12 14:15:27 +08:00
ZhangBiao ed319be87e 神将置换 2020-08-12 14:13:16 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +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 3d2f288934 轩辕宝镜提交 2020-08-11 09:48:21 +08:00
jiaoyangna 5c13a25bb5 encoding convert 2020-08-06 17:37:42 +08:00
jiaoyangna 22b02b5cca encoding convert 2020-08-06 17:35:07 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
ZhangBiao dd06fc4652 充值入口恢复,加 充值switch 2020-07-31 13:35:15 +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
gaoxin f058668af6 修复红点id重复,导致聊天红点显示错误的问题 2020-07-29 11:39:52 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
ZhangBiao ddfbb25e2e 森罗bug修复 2020-07-28 16:45:28 +08:00
ZhangBiao 52c34aa2a3 花费妖晶抽卡提示优化 2020-07-28 15:24:11 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +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
jiaoyangna 7c92ddc60a 副本置灰修改提交 2020-07-25 18:35:05 +08:00
jiaoyangna 6742056a93 冲突解决提交 2020-07-25 15:18:07 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
zhangqiang abfde3e8a9 巅峰战bug and 使用按钮需求 2020-08-24 21:46:19 +08:00
zhangqiang 4d0b53adf9 巅峰赛货币显示 2020-08-05 21:03:36 +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
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 3b3dbec6a7 添加巅峰赛编队 2020-07-23 14:36:28 +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
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +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
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
ZhangBiao 97bfdd53b6 十绝阵开启阶段加入公会不可挑战十绝阵 2020-07-20 11:21:16 +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
zhangqiang 25896729ff 商店去掉刷新红点 2020-07-17 11:32:20 +08:00
zhangqiang ebca764861 首冲 2020-07-17 11:27:03 +08:00
jiaoyangna 1838823c37 幸运探宝提交 2020-07-16 20:24:28 +08:00
zhangqiang 8f96d9f067 探宝红点 2020-07-16 18:01:03 +08:00
gaoxin 5b7b28f1f9 sdk接入结构修改 2020-07-16 17:00:24 +08:00
ZhangBiao 9d47ce9767 小游戏bug修复 2020-07-16 13:45:07 +08:00
ZhangBiao de9290e4a0 物品掉落特效+跳过按钮 2020-07-15 16:35:51 +08:00
ZhangBiao 2ab6d17841 森罗小游戏修改 2020-07-14 21:03:44 +08:00
ZhangBiao eddaa95312 宝囊 2020-07-14 11:05:47 +08:00
ZhangBiao 4c6369e51d 乾坤宝囊修改 2020-07-13 20:07:06 +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
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
2han9B1a0 47b34f9d6e 宝囊 2020-07-09 11:52:40 +08:00
2han9B1a0 39d035b21a no message 2020-07-08 21:09:45 +08:00
zhangqiang b3dc6d0688 巅峰赛 2020-07-08 15:02:16 +08:00
2han9B1a0 51089bd2c8 福利界面报错 2020-07-08 11:46:43 +08:00
2han9B1a0 4aed395ed3 乾坤包囊 2020-07-08 09:40:36 +08:00
zhangqiang bff7df21e4 装备出售界面添加 2020-07-07 15:20:43 +08:00
zhangqiang 4b8bae38b3 宝物分解界面提交 2020-07-06 16:27:27 +08:00
zhangqiang 9c68ea0c73 巅峰战修改提交 2020-07-03 16:10:54 +08:00
JieLing b3c70f66e4 svn逻辑tongbu 2020-07-01 18:14:03 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 7dea7af830 同步 2020-05-15 17:03:13 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 00892194b5 提交 2020-05-11 09:38:52 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00