Commit Graph

1975 Commits (7551842ba783f26808dbf18635f4b7292a92e0fa)

Author SHA1 Message Date
jiaoyangna 3c41e96caa 【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题

(cherry picked from commit 1ec5cc7b05)
2021-06-28 18:36:01 +08:00
jiaoyangna 1ec5cc7b05 【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
2021-06-28 18:34:19 +08:00
jiaoyangna 8f226ad066 玲珑宝镜提交 2021-06-28 18:25:21 +08:00
ZhangBiao 65887aa135 【站内信】提交 2021-06-28 10:44:15 +08:00
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
gaoxin fbf43c9a3c 【适配】修复适配后图鉴界面不显示内容 2021-06-26 17:15:57 +08:00
wangzhenxing fda66630b9 [适配]==== 战中boss界面,图鉴主界面修改提交 2021-06-26 17:11:10 +08:00
gaoxin 23293e2ddc 【适配】图鉴角色信息界面适配优化 2021-06-26 17:07:36 +08:00
jiaoyangna 83f549cc6d 首充滑动修改 2021-06-26 15:16:08 +08:00
jiaoyangna 7542d5e607 首充修改提交 2021-06-26 15:15:27 +08:00
jiaoyangna de4bcd80b5 ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-26 15:15:19 +08:00
ZhangBiao 4e2463723a 【灵兽】特效添加 2021-06-26 14:50:52 +08:00
jiaoyangna 68b2095547 首充滑动修改 2021-06-25 18:41:34 +08:00
zhangqiang 71540fcfd2 【跨服天梯】国内提交1 2021-06-25 15:23:55 +08:00
zhangqiang 6f7d6731a4 【特效】主城/挂机界面自己小人脚底添加光圈4 2021-06-25 11:52:54 +08:00
zhangqiang c7f8a84c99 【特效】主城/挂机界面自己小人脚底添加光圈 2021-06-24 16:15:39 +08:00
ZhangBiao 097cf4055f 【灵兽界面优化】优化界面效果 2021-06-24 14:47:54 +08:00
ZhangBiao 18d4289e39 【锻器阁】合成装备超框 2021-06-24 14:11:51 +08:00
jiaoyangna 6b70f85740 Merge branch 'china/dev' into china/dev-c 2021-06-24 14:05:01 +08:00
ZhangBiao 6c5d6a4be4 【用户隐私协议】提交 2021-06-24 11:38:43 +08:00
jiaoyangna 748f9be757 首充修改提交 2021-06-24 11:12:34 +08:00
jiaoyangna 527a35b2c0 【青龙秘宝】缩小奖励间隔,当奖励大于4个时,能显示第五个奖励的部分内容 2021-06-24 10:24:48 +08:00
ZhangBiao 57426134aa 【Android】登录界面调整 2021-06-24 09:50:55 +08:00
JieLing 7783e0723e 【Android】打开网页功能 2021-06-23 19:39:46 +08:00
jiaoyangna 234f3cb48f ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-23 18:51:35 +08:00
zhangqiang 8cdb8123e3 【美术 -特权优化】快捷任务底框换一个更明显的,突出文字 2021-06-23 18:08:54 +08:00
jiaoyangna cb37edbba0 秘宝间隔调整 2021-06-21 18:26:31 +08:00
jiaoyangna 77dea82a94 【ID1016745】
【升级豪礼】新到的图片资源,需要替换
2021-06-21 11:42:19 +08:00
jiaoyangna 0014224024 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:30:50 +08:00
jiaoyangna daba103fdb 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:06:23 +08:00
jiaoyangna 0f309447c2 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:53:24 +08:00
jiaoyangna e5ff298534 Revert "【ID1016740】"
This reverts commit 343b92aff9.
2021-06-21 10:38:09 +08:00
jiaoyangna 343b92aff9 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:36:33 +08:00
jiaoyangna c2f6c54063 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 10:22:21 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
jiaoyangna 67e5cbf8c9 大圣 不能查看详情修改 2021-06-19 15:29:31 +08:00
jiaoyangna bf1e1f69e6 添加以领取标志 2021-06-18 19:13:51 +08:00
jiaoyangna e267c0096b 预设提交 2021-06-18 18:56:46 +08:00
jiaoyangna 45a1079d88 大圣提交 2021-06-18 18:55:04 +08:00
jiaoyangna 60b2cf1cf6 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
2021-06-18 18:27:01 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
ZhangBiao ddfe59a1d0 【升星有礼】 2021-06-18 18:17:36 +08:00
ZhangBiao a05df3c77e 【升星有理】 2021-06-18 18:10:58 +08:00
ZhangBiao a60e8a4329 【惊喜礼盒】底部回弹位置低 2021-06-18 15:06:53 +08:00
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 10c86e509a 超凡入圣修改提交 2021-06-18 10:50:04 +08:00
ZhangBiao 6ca32cdde3 【惊喜礼盒】提交 2021-06-17 18:50:19 +08:00
ZhangBiao bd4796a4af 【惊喜礼盒】右侧文字格式修改 2021-06-17 18:04:10 +08:00
jiaoyangna 4c1cd67e6e Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:56:51 +08:00
ZhangBiao a6f4c307b5 【惊喜礼盒】 2021-06-17 17:55:14 +08:00
ZhangBiao 9b6e14eeb1 【惊喜礼盒】完成! 2021-06-17 17:43:56 +08:00
jiaoyangna 5c09522231 Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:19:27 +08:00
ZhangBiao 87f3fa8f64 【惊喜礼盒】提交 2021-06-17 17:09:36 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
gaoxin 12bd0b64a1 Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-17 10:26:13 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
jiaoyangna b96df9fc63 玲珑修改提交 2021-06-16 17:55:19 +08:00
jiaoyangna 27bfb84fb5 问号大小修改提交 2021-06-16 15:29:29 +08:00
jiaoyangna 0bfea18692 问号大小修改 2021-06-16 15:25:48 +08:00
jiaoyangna c5ecf50429 修改问号位置 2021-06-16 15:12:05 +08:00
jiaoyangna e9dc207f46 玲珑提交 2021-06-16 13:42:32 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
JieLing b7e78d9d5f Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +08:00
gaoxin b3fca866e8 Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
2021-06-16 10:09:15 +08:00
gaoxin 3dc9dd5d64 Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
2021-06-16 10:09:04 +08:00
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
gaoxin 28c7d285a0 Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
2021-06-11 02:36:08 +08:00
gaoxin 03d56901d7 【包配置】将登录图配置放到streaming文件夹 2021-06-11 01:48:39 +08:00
gaoxin 77acfd6bcd 【登录】版号信息走表配置 2021-06-11 01:45:09 +08:00
jiaoyangna d72a7b79e0 玲珑宝镜修改提交 2021-06-10 15:36:59 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
gaoxin 1a12b261d5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:20:38 +08:00
gaoxin 07a35aec13 【幸运探宝】按钮位置修改 2021-06-09 20:20:16 +08:00
zhangqiang d21ebe57bb 【心魔试炼】2 2021-06-09 20:12:11 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
gaoxin 53b2ae451f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:18:52 +08:00
gaoxin a10d34b076 【逐胜之巅】入口资源添加文字 2021-06-09 18:18:35 +08:00
jiaoyangna 70cc891df2 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:14:26 +08:00
jiaoyangna c40c6640c9 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:02:05 +08:00
zhangqiang 9a1f0078df 【部分美术效果无法展示】1 2021-06-09 15:58:04 +08:00
gaoxin 5a54f51107 【主界面】逐胜之巅资源替换 2021-06-09 15:00:49 +08:00
gaoxin 9a164336fa 【资源】战斗背景替换,主界面删除转盘 2021-06-09 14:52:00 +08:00
zhangqiang 04fba6a182 【页签优化】游戏内分页签高度距离统一化 2021-06-09 12:32:30 +08:00
zhangqiang 53c42a56f7 【线上】【特权】属性加成位置缺少黑色半透图层 2021-06-09 11:20:05 +08:00
jiaoyangna d91a94d309 【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
2021-06-08 20:47:03 +08:00
jiaoyangna 470e7c4430 【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
2021-06-08 18:07:22 +08:00
jiaoyangna 9681a00816 【ID1009395】
点将台增加剩余保底次数显示
2021-06-08 15:15:13 +08:00
jiaoyangna 4c7decb60b 礼包预设特效修改 2021-06-07 11:30:01 +08:00
ZhangBiao a96a61ec77 【逐胜之巅】入口调整至左侧 2021-06-07 11:18:37 +08:00
gaoxin 717994657e 【无尽副本】界面适配调整 2021-06-04 22:35:43 +08:00
gaoxin 9c17db0f82 【登录】删除版号信息显示 2021-06-04 20:33:47 +08:00
ZhangBiao a549f0c45b 【礼包】特效层级问题修改 2021-06-04 18:52:23 +08:00
gaoxin f708fb6671 【登录视频】优化静态背景切换到视频的效果 2021-06-04 10:08:57 +08:00
gaoxin 092ab0e348 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:54 +08:00
jiaoyangna fba66fae7e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 14:31:30 +08:00
jiaoyangna 66954a3f65 礼包特效 2021-06-03 14:31:10 +08:00
gaoxin 9bd23a74cf 【登录视频】优化加载过程 2021-06-03 13:52:55 +08:00
gaoxin 11d7cc3e89 【关卡】介绍文字修改 2021-06-03 11:20:53 +08:00
wangzhenxing 21492a76af Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:08:07 +08:00
wangzhenxing 5cf037f6da [称号]=======聊天界面新称号显示修改 2021-06-02 21:07:02 +08:00
zhangqiang 935bae0f1c 【无尽副本】添加帮助和商店入口 2021-06-02 20:33:30 +08:00
zhangqiang 6fc419abe5 【无尽副本】添加帮助和商店入口 2021-06-02 20:07:04 +08:00
ZhangBiao 1270be7823 【登录界面】增加视频 2021-06-02 17:52:26 +08:00
ZhangBiao f8800771d8 【登录界面】增加视频 2021-06-02 16:43:56 +08:00
jiaoyangna 43941d2c7b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 15:45:06 +08:00
jiaoyangna 755edc5913 百宝商会特效提交 2021-06-02 15:42:46 +08:00
ZhangBiao 7679f85af3 【修行】图标调整 2021-06-02 11:08:24 +08:00
gaoxin 39bb3d5c06 【称号】修改称号节点为通用节点 2021-06-01 21:13:03 +08:00
jiaoyangna c4c0cb5a69 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:53:25 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
zhangqiang 3516118d51 【山河社稷图】宝箱节点加特效 2021-06-01 15:48:29 +08:00
jiaoyangna 872a9c57ac 百宝修改提交 2021-06-01 14:49:51 +08:00
gaoxin a7fad33250 【tip】修复会遮挡点击事件的问题 2021-06-01 14:09:14 +08:00
ZhangBiao 3ef54596d3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 13:54:32 +08:00
ZhangBiao c98aa8c703 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
jiaoyangna d7947bcf75 关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方) 2021-06-01 10:50:22 +08:00
ZhangBiao 581be265af Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 11:58:56 +08:00
ZhangBiao a6b6b2222b 【牛气冲天】奖励位置修改 2021-05-31 11:58:45 +08:00
jiaoyangna 0d7f28a9fa 百宝修改提交 2021-05-31 11:06:23 +08:00
jiaoyangna 59c3bbf5ae 百宝 修改 2021-05-31 10:46:34 +08:00
ZhangBiao a1e7cb334a 【成长礼包】玉帝立绘下调 2021-05-29 22:49:24 +08:00
wangzhenxing b1fcc5d4e5 [限时活动,福利红包]=======bug修改 2021-05-29 20:36:26 +08:00
jiaoyangna 9275f0f011 字修改提交 2021-05-29 20:22:55 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna 9c932e0d8c 积分修改 2021-05-29 19:56:09 +08:00
jiaoyangna 4bc9e9ddd8 百寶提交 2021-05-29 18:52:42 +08:00
jiaoyangna 2b1356db5c 百寶商會 2021-05-29 18:36:27 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
wangzhenxing b49fcce742 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:37:09 +08:00
wangzhenxing 574d95b607 [限时祈愿活动]======修改bug提交 2021-05-29 15:35:52 +08:00
jiaoyangna 51ead3f754 百宝修改提交 2021-05-29 14:20:21 +08:00
jiaoyangna 50de08e3f3 名称修改 2021-05-28 19:19:56 +08:00
jiaoyangna 2246cd5260 物名称标识调整 2021-05-28 19:18:43 +08:00
jiaoyangna 876322a315 【限时兑换】人物名称标识调整 2021-05-28 19:16:43 +08:00
jiaoyangna c0f4310d19 百宝 2021-05-28 19:03:31 +08:00
jiaoyangna e60c32cab1 百宝商会修改提交 2021-05-28 18:58:15 +08:00
jiaoyangna f6d701fc6a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 18:53:57 +08:00
jiaoyangna fb8db45fda 百宝商会修改提交 2021-05-28 18:53:54 +08:00
zhangqiang 46a7f519fb 【探索统计】复现步骤挂机满12小时不领,激活月卡立即前往,返回充值页面再返回主城 2021-05-28 17:40:42 +08:00
wangzhenxing 53cbc08d48 [限时祈愿]=============抽卡修改 2021-05-28 16:54:40 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
ZhangBiao 5bd86d81fe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:12:07 +08:00
ZhangBiao 4af21bc33d 【幸运探宝】进度条奖励包装显示修改 2021-05-28 15:11:57 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
gaoxin fe996d3e54 【战斗】修复不满屏显示的问题 2021-05-28 13:36:36 +08:00
gaoxin d66ee3980d 【战斗】删除上部边框 2021-05-28 13:35:02 +08:00
jiaoyangna b78b006009 神将情报界面修改提交 2021-05-28 12:30:47 +08:00
gaoxin 36240be7e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 11:23:37 +08:00
gaoxin c76af7fe0b 【左上角图标UI】六星玉帝图标没有置顶 2021-05-28 11:23:10 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +08:00
jiaoyangna 765d58f459 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 22:34:15 +08:00
jiaoyangna a996bbc219 无尽修改提交 2021-05-27 22:34:11 +08:00
gaoxin 95b207e1eb 【每日礼包】一键购买点击无效 2021-05-27 22:24:28 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 4b2a71c6eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:29:06 +08:00
ZhangBiao dd29682429 【成长礼包】新换的会动的玉皇大帝,后面没背景 2021-05-27 18:28:49 +08:00
gaoxin 9f8858b4f7 【主界面】左上角按钮自动排列 2021-05-27 18:20:32 +08:00
gaoxin 8ebd47a087 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:13:08 +08:00
gaoxin ba4debba7b 【主界面】左上角按钮自动排列 2021-05-27 18:13:03 +08:00
ZhangBiao 6050b780dd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:58:02 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
gaoxin cb367d4928 【排行榜】界面显示优化 2021-05-27 17:50:30 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
zhangqiang ff837e338e 【山河社稷图小点】预设修改提交 2021-05-27 15:38:44 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
jiaoyangna a9b52e6834 无尽副本修改提交 2021-05-27 15:16:46 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
gaoxin 19adbf944e 【每日礼包】资源修改 2021-05-27 14:02:53 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
jiaoyangna b197244667 无尽副本修改提交 2021-05-27 09:46:56 +08:00
jiaoyangna 92633b6913 秘宝修改提交 2021-05-26 21:58:48 +08:00
zhangqiang dbee1bef07 【山河社稷图】bug 2021-05-26 20:21:55 +08:00
jiaoyangna 8f6fce191b 无尽任务提交 2021-05-26 18:07:09 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
zhangqiang 9322a8489a 【提交】 2021-05-26 14:59:25 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
ZhangBiao f38620058c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 21:09:43 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
zhangqiang dfa198081a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:51:58 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
jiaoyangna 4a5dc61add Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:32:54 +08:00
jiaoyangna bec733c9d6 预设提交 2021-05-25 10:32:42 +08:00
gaoxin 289a75c741 【挂机】修复挂机帮助和vip任务重叠的问题 2021-05-25 10:31:44 +08:00
ZhangBiao a22a984c61 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:16:17 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
jiaoyangna c9c5480484 福星高照 提交 2021-05-25 10:07:31 +08:00
jiaoyangna 40fcabaf55 牛气冲天 提交 2021-05-24 20:26:53 +08:00
jiaoyangna 1d11aeb1b0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 19:50:38 +08:00
jiaoyangna b36d04f7d7 牛气冲天 修改 2021-05-24 19:50:21 +08:00
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
ZhangBiao 6294f34149 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 16:38:41 +08:00
ZhangBiao 43a817235f 【修行】英雄选择附身中 2021-05-24 16:38:30 +08:00
gaoxin 6d9f8f2f3d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 15:44:17 +08:00
gaoxin d37728e374 【配置】修复公告兑换码不显示的问题 2021-05-24 15:44:10 +08:00
ZhangBiao 6f27423920 【修行】提交 2021-05-24 14:58:00 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
jiaoyangna 1f914e4ae9 预设提交 2021-05-24 14:40:54 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
ZhangBiao 04140ca1f2 【修行】神印按钮条件 2021-05-24 13:48:07 +08:00
ZhangBiao d9b465c7cf 【修行】英雄选择界面修改 2021-05-24 12:02:20 +08:00
ZhangBiao dade783281 【修行】英雄选择界面修改 2021-05-24 11:53:44 +08:00
jiaoyangna a10ec722e5 无尽副本提交 2021-05-24 11:51:11 +08:00
ZhangBiao 82a0370730 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 11:22:07 +08:00
ZhangBiao 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
jiaoyangna 4ced80cf6a 福星高照,牛气冲天 提交 2021-05-24 11:08:16 +08:00
ZhangBiao daf5a675f8 【修行】预览界面资源添加 2021-05-22 18:52:49 +08:00
ZhangBiao b64e85bc2c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-22 18:20:14 +08:00
ZhangBiao 165ad7a2de 【修行】提交 2021-05-22 18:20:07 +08:00
jiaoyangna 3bd06ba84b 【主题活动】活动商店背景图不正确,需要统一,类似社稷大典或乾坤宝盒商店这些商店等。 2021-05-22 17:17:43 +08:00
zhangqiang e404e26ffa 【山河社稷图】 2021-05-22 15:55:14 +08:00
jiaoyangna 7cc12e74a8 无尽修改提交 2021-05-22 14:08:34 +08:00
zhangqiang cb86e3efd4 【山河社稷图】 2021-05-21 19:07:46 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
zhangqiang 016667ef7e 【战斗背景音乐】 山河社稷图入口文字 2021-05-21 16:38:20 +08:00
zhangqiang d2a53631d6 【山河社稷图】提交 2021-05-21 16:21:07 +08:00
gaoxin 24e02b07c6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-21 15:31:48 +08:00
gaoxin f6067f4402 【战斗】跳过优化 2021-05-21 15:31:40 +08:00
zhangqiang 4aaa6b29de 【山河社稷图】入口 + 特权修改 2021-05-21 15:29:14 +08:00
wangzhenxing db3b58ea8e 合并冲突提交 2021-05-21 15:05:09 +08:00
wangzhenxing 6ab70e6e8d 【功能】==========公会红包 2021-05-21 14:47:04 +08:00
zhangqiang 1ed6cbaad0 【山河社稷图】替换新资源 2021-05-21 14:37:09 +08:00
gaoxin 006eae4bd9 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00
gaoxin e72d1ee9c0 【挂机】优化跳转 2021-05-21 11:01:37 +08:00
zhangqiang da17fb96ed 【主城修改】2 2021-05-20 20:32:04 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00