Commit Graph

198 Commits (766ba304eda437dbde3f0dcf8003485c63becdcc)

Author SHA1 Message Date
guowei 0eae27d30d 【鸿蒙阵bug修改】 2021-01-06 10:03:38 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
zhangqiang ed65735dc5 【重置优化】将游戏中的各个玩法重置时间统一调整至0点 2021-01-04 14:27:18 +08:00
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
jiaoyangna 5a0bece22e 所向披靡修改 2020-12-24 10:23:02 +08:00
guowei 2ac574ff06 【鸿蒙阵bug】更新 2020-12-23 17:41:31 +08:00
ZhangBiao 8801a84c2b 【新将活动】商店跳转修复 2020-12-23 17:28:20 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
guowei 0454746498 【鸿蒙阵】 2020-12-21 10:08:30 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
guowei f744e609a1 【鸿蒙阵剩余图片】 2020-12-18 16:31:28 +08:00
guowei 4f4542d53a 【鸿蒙阵】 2020-12-18 13:39:35 +08:00
jiaoyangna 9f01de23ea [主题活动] 2020-12-18 11:22:54 +08:00
guowei 52d493ebc7 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级)
(cherry picked from commit 4ef08d456e)
2020-12-08 15:05:35 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
DESKTOP-98AVA47\Administrator 15eebe4584 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
gaoxin a65c528256 【GM】战斗种子数据类型错误 2020-11-11 16:10:21 +08:00
gaoxin a3d6f49e15 【gm】修复战斗数据gm报错的问题 2020-11-11 16:04:01 +08:00
gaoxin f1ca8398d3 【战斗】假战斗随机种子读表 2020-11-06 15:04:11 +08:00
gaoxin d668e4ffc3 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
2020-11-06 11:19:46 +08:00
zhangqiang 3ae2d1048e 【GM】gm工具优化 2020-11-06 11:16:24 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
zhangqiang cbe24364ec 【灵兽系统】 调主城的位置 2020-11-02 18:16:28 +08:00
zhangqiang df8f8d6dd0 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:06 +08:00
gaoxin 9ed00e0ba5 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
zhangqiang 6a0a52997c 变幻莫测 提交 2020-09-17 12:35:45 +08:00
jiaoyangna 06dcc9f41c 勇往直前 提交 2020-10-21 14:13:07 +08:00
ZhangBiao f0e9063c97 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-16 17:56:39 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 31895e8e25 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:44 +08:00
jiaoyangna 8ff0382e41 丹心碧血主界面icon 修改提交 2020-10-15 14:06:16 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
JieLing c3cce0b06e 百宝商会活动添加 2020-09-27 16:52:40 +08:00
ZhangBiao e9b994126e 三界降魔 2020-09-27 16:43:42 +08:00
ZhangBiao c4706208ef 三界除魔功能添加 2020-09-27 16:43:33 +08:00
jiaoyangna 17675838d7 漏提 2020-09-22 17:46:55 +08:00
jiaoyangna 51adf32101 漏提 2020-09-22 17:37:28 +08:00
ZhangBiao 8232879006 车迟排名界面调整、日常本底部适配、万象境“新”字bug修复 2020-09-04 14:30:39 +08:00
jiaoyangna 36b66f03e1 【破阵诛仙】 在线结束,主城入口显示0000不消失,点击入口黑屏 2020-09-10 15:08:13 +08:00
gaoxin 97eaf77009 主界面底部界面经验条显示调整 2020-09-01 17:12:00 +08:00
gaoxin c6bdebeffb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
2020-09-01 14:38:29 +08:00
gaoxin ae349123df 部分界面屏幕适配调整 2020-09-01 14:38:02 +08:00
zhangqiang cf7b336eef 漏提 2020-09-01 09:37:51 +08:00
zhangqiang a6fa4453e6 需求主城或关卡停留过长添加聊天气泡 2020-08-31 20:52:50 +08:00
gaoxin 2d9d097d98 修复巅峰赛按钮时间显示0的问题 2020-08-28 12:08:23 +08:00
gaoxin 5d03b4fea8 巅峰赛按钮当日五点开始显示 2020-08-28 01:24:32 +08:00
JieLing 0f3b38f85e 修复主界面巅峰赛按钮时间显示错误的问题 2020-08-27 11:49:58 +08:00
zhangqiang c315cf768d 竞技场排行 2020-08-27 10:52:35 +08:00
gaoxin 093c6d1f41 竞技场按钮功能未开启不再显示 2020-08-26 18:18:12 +08:00
gaoxin 80e2f16169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:58:51 +08:00
gaoxin bab4148db6 主界面十绝阵,巅峰赛按钮添加 2020-08-26 17:58:23 +08:00
jiaoyangna 22fa2b0d4c qinglong commit 2020-08-26 15:57:06 +08:00
jiaoyangna d1ab290cf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
2020-08-25 16:26:13 +08:00
jiaoyangna 87cc8867c7 宝物 commit 2020-08-25 16:23:41 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna 9ad0593572 qinglong redpoint commit 2020-08-25 11:21:42 +08:00
jiaoyangna 7ef2347d47 【破阵诛仙/超值基金】主城入口计时,够一天显示天,小于一天应该显示时分秒 2020-08-24 20:15:18 +08:00
ZhangBiao 76f5a343eb 云梦祈福入口时间、青龙秘宝时间显示 2020-08-24 18:51:05 +08:00
gaoxin d4530f6ccf 修复新人物资源导致的报错 2020-08-24 17:43:28 +08:00
jiaoyangna 68e88e0f0d commit spine 2020-08-24 16:49:20 +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 36d96dcd84 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:20:13 +08:00
ZhangBiao 939fa0227a 无尽入口例会、化虚进入修复、剪影仙踪 2020-08-24 15:20:00 +08:00
gaoxin 2abfd842cf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:01:26 +08:00
gaoxin 395c41ef79 Merge branch 'temp' into master_develop 2020-08-24 14:36:54 +08:00
jiaoyangna af58044b17 【宝物】宝物合成,合成预览和恭喜获得不一致 2020-08-24 14:31:44 +08:00
jiaoyangna fb4d9e0d45 commit 2020-08-22 22:27:52 +08:00
zhangqiang fe00d8726a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 20:25:28 +08:00
zhangqiang 028761ebaf 打开暴力输出 2020-08-22 20:25:12 +08:00
jiaoyangna 056815a8b6 patch commit 2020-08-22 19:40:14 +08:00
gaoxin 4f8026425d sdk添加上传新手数据的接口 2020-08-22 19:14:58 +08:00
ZhangBiao be23f0c38a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 17:05:53 +08:00
ZhangBiao 8de86ce4ac 无尽副本入口 2020-08-22 17:05:37 +08:00
gaoxin f2ae18778c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 17:02:48 +08:00
jiaoyangna 69a5b9b519 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
2020-08-22 16:46:17 +08:00
jiaoyangna fa6bdeeb6a huoqu huodongzhuangtai tijiao 2020-08-22 16:43:39 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
jiaoyangna f0f8a5d69e qinglong update 2020-08-22 15:42:07 +08:00
jiaoyangna 2646f9418a 2020-08-28 18:32:59 +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
ZhangBiao e9b8083148 2020-08-20 14:43:48 +08:00
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00