Commit Graph

6266 Commits (86679edd3e837bca806f6aa58b862b7a4c717bd6)

Author SHA1 Message Date
gaoxin 3f605a818b 【资源】修改白金框资源 2021-06-02 17:30:39 +08:00
ZhangBiao f8800771d8 【登录界面】增加视频 2021-06-02 16:43:56 +08:00
ZhangBiao 5c198bc9ec Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 16:20:15 +08:00
gaoxin c2ea84ce81 【资源】登录界面视频添加 2021-06-02 16:19:53 +08:00
ZhangBiao 336cbd2c35 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 15:47:35 +08:00
ZhangBiao 2c677c0093 【牛氣衝天】报错修改 2021-06-02 15:47:26 +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 592fad463d 【玉皇大帝】入口顯示 2021-06-02 15:12:44 +08:00
ZhangBiao a6c7de8151 【主界面】成长礼包入口提交 2021-06-02 14:56:09 +08:00
ZhangBiao 0798248214 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 14:50:26 +08:00
ZhangBiao e1145deced 【玉皇大帝入口】如果购买完成长礼包,就不显示 2021-06-02 14:50:18 +08:00
wangzhenxing 6d41cde054 [称号]=======称号无法卸下修改提交,称号高度修改 2021-06-02 14:47:54 +08:00
zhangqiang 2cbe6e3617 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 14:35:18 +08:00
zhangqiang 8ccafd974e 【鸿蒙阵】文字显示错误 2021-06-02 14:34:59 +08:00
gaoxin 4eea852340 【称号】修复主界面称号偶现没有特效的问题,聊天界面称号逻辑修改 2021-06-02 14:34:51 +08:00
gaoxin 548f3f9f00 【称号】修复老包称号显示错误的问题 2021-06-02 14:32:16 +08:00
ZhangBiao c2f905940b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:34:22 +08:00
ZhangBiao 61f516f991 【修行】增加突破成功提示 2021-06-02 11:34:11 +08:00
wangzhenxing 2de61d062d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:29:45 +08:00
wangzhenxing ba04ea8e71 【心愿抽卡】====修改概率显示,必得剩余次数修改 2021-06-02 11:29:26 +08:00
gaoxin 4bd4721069 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:25:11 +08:00
gaoxin dbcaf8e5ca 【称号】踏碎凌霄称号显示优化 2021-06-02 11:25:06 +08:00
ZhangBiao 31b7ba2508 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:09:02 +08:00
ZhangBiao 6b0e14d55d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:08:33 +08:00
ZhangBiao 7679f85af3 【修行】图标调整 2021-06-02 11:08:24 +08:00
jiaoyangna fd8d35fabb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 11:08:20 +08:00
jiaoyangna ec55dc15af 红点提交 2021-06-02 11:08:03 +08:00
zhangqiang 18053ad192 【魂印】前端容错 2021-06-02 10:16:57 +08:00
gaoxin 39bb3d5c06 【称号】修改称号节点为通用节点 2021-06-01 21:13:03 +08:00
jiaoyangna b2a71d4f8c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 20:22:30 +08:00
jiaoyangna b345d54cbe 剧情修改提交 2021-06-01 20:22:14 +08:00
zhangqiang f9af054ec6 点将台10连加入红点提示 2 2021-06-01 20:10:34 +08:00
ZhangBiao 1c19adf8ca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 20:02:57 +08:00
ZhangBiao 681b3b63bb 【每日礼包】特效问题修改 2021-06-01 20:02:48 +08:00
zhangqiang fb8410eaa5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 19:48:05 +08:00
zhangqiang 859bd6679e 点将台10连加入红点提示 2021-06-01 19:47:54 +08:00
gaoxin a923acdcb1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 18:08:05 +08:00
gaoxin 61be59d1f3 【称号】显示优化 2021-06-01 18:08:00 +08:00
jiaoyangna bd8fabff53 【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常 2021-06-01 18:04:47 +08:00
jiaoyangna 5be197ea1f 【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常 2021-06-01 17:52:07 +08:00
jiaoyangna 95fbdc63c5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 17:45:13 +08:00
jiaoyangna 83bc0a2c21 【每日礼包】停留界面等待刷新,显示00:00:00需要切换页前恢复正常 2021-06-01 17:44:55 +08:00
gaoxin 208f9ec119 【loading】修复loading条未到100%文字显示已经到100% 2021-06-01 17:34:08 +08:00
jiaoyangna a1ac495ca2 红点提交 2021-06-01 17:22:23 +08:00
jiaoyangna e6dc31fb9b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 17:11:19 +08:00
jiaoyangna 32750ffa34 【无尽副本】未激活五星神将或未选择五星神将不允许进入地图 2021-06-01 17:10:07 +08:00
wangzhenxing 54d0501bed Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:59:42 +08:00
wangzhenxing 5bcfe86999 【公会红包】====红包刷新逻辑修改 2021-06-01 16:59:27 +08:00
ZhangBiao 45df61f535 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:55:13 +08:00
ZhangBiao 0cfcbd8821 【星辰商店】入口光效穿透 2021-06-01 16:54:30 +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
ZhangBiao be9a815d00 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:39:30 +08:00
ZhangBiao 9f586818c2 【修行】特效问题提交 2021-06-01 16:39:09 +08:00
gaoxin d688a013bb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:30:22 +08:00
gaoxin 2c7b62e2e4 【资源】物品资源导入 2021-06-01 16:30:17 +08:00
zhangqiang 3516118d51 【山河社稷图】宝箱节点加特效 2021-06-01 15:48:29 +08:00
gaoxin 58faec4feb 【红点】主界面鸿蒙阵红点没有清除 2021-06-01 15:44:18 +08:00
ZhangBiao 7befa27a1d 【功能引导】首充引导,在入口栏下拉状态下引导,会引导收起 2021-06-01 15:11:03 +08:00
ZhangBiao 857d52c057 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:59:07 +08:00
ZhangBiao 2a4927477c 【主题活动】跳转问题 2021-06-01 14:58:57 +08:00
jiaoyangna 8f31b07d52 主城百宝时间修改提交 2021-06-01 14:54:46 +08:00
jiaoyangna 162cea9631 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:50:10 +08:00
jiaoyangna 872a9c57ac 百宝修改提交 2021-06-01 14:49:51 +08:00
wangzhenxing aa3171aef7 [抽卡祈愿]======活动报错修改 2021-06-01 14:41:28 +08:00
jiaoyangna dd990fd4b2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:15:24 +08:00
jiaoyangna 1f1d9f6ff2 活动页签修改提交 2021-06-01 14:12:49 +08:00
gaoxin a7fad33250 【tip】修复会遮挡点击事件的问题 2021-06-01 14:09:14 +08:00
ZhangBiao 8c6ec719f0 【名字颜色】排行榜首页颜色 2021-06-01 14:02:25 +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 d82bbbf579 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 13:54:05 +08:00
jiaoyangna a1bc2ae463 活动修改提交 2021-06-01 13:53:47 +08:00
zhangqiang 7048691167 【心愿抽卡】十连没音效 2021-06-01 13:42:36 +08:00
jiaoyangna ad004ddc5e 限时召唤修改提交 2021-06-01 11:46:00 +08:00
jiaoyangna a60e73f5ef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 11:45:19 +08:00
jiaoyangna 12fcc3ea14 【百宝商会】剩余时间显示错误,应显示当天刷新时间 2021-06-01 11:44:49 +08:00
zhangqiang ba93c4e861 【抽卡跳过音效没有跳过】 2021-06-01 11:16:37 +08:00
jiaoyangna 5c778aad22 森罗幻境】试炼精气特效消失 2021-06-01 10:58:46 +08:00
jiaoyangna d7947bcf75 关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方) 2021-06-01 10:50:22 +08:00
jiaoyangna 5bc754678e 报错修改 2021-05-31 20:39:46 +08:00
ZhangBiao bfd8bee59e 【青龙秘宝】刷新不及时修改 2021-05-31 20:09:19 +08:00
gaoxin 081ff4c0d8 【资源】修行和困难副本预告图标上传 2021-05-31 19:20:37 +08:00
gaoxin 0def3449c3 【配置】loading界面背景实现配置 2021-05-31 19:19:57 +08:00
wangzhenxing 5ec2c38563 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:02:05 +08:00
wangzhenxing db6f172f70 [显示抽卡活动]============抽卡活动类型常量修改 2021-05-31 18:01:37 +08:00
ZhangBiao b4dc20a3bb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:01:19 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
zhangqiang 78a6fe54d8 【大闹天宫】重置阶段,点主城也会提示 2021-05-31 17:39:13 +08:00
wangzhenxing b6787d229c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:34:50 +08:00
wangzhenxing 7387023dfe [战斗]======通关星级条件 检测逻辑 4 修改 2021-05-31 17:33:29 +08:00
gaoxin 8b35b8ccf7 【踏碎凌霄】称号icon上传 2021-05-31 17:32:18 +08:00
gaoxin 60e474f248 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:31:46 +08:00
gaoxin 6b0ff9668d 【配置】包配置添加 2021-05-31 17:31:31 +08:00
zhangqiang c5d1a11be2 【限时抽卡】 2021-05-31 17:22:30 +08:00
zhangqiang f618955409 【限时抽卡】报错修复 2021-05-31 17:15:24 +08:00
jiaoyangna e1b523c394 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:08:07 +08:00
jiaoyangna 0268a71c9b 无尽秘宝描述修改提交 2021-05-31 17:07:49 +08:00
gaoxin 7f0e97dd32 【资源】名字重复修正 2021-05-31 16:29:01 +08:00
ZhangBiao 337cb0a203 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:18:13 +08:00
ZhangBiao 6d0e6a9e1a 【名字颜色】公会申请 2021-05-31 15:18:02 +08:00
gaoxin 3d412a4b85 【登录】登录接口添加新的参数 2021-05-31 15:15:20 +08:00
gaoxin bddb02cf81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:02:06 +08:00
gaoxin 9b3a837d4d 【资源】踏碎凌霄称号资源上传 2021-05-31 15:01:58 +08:00
ZhangBiao f61ac46634 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:00:43 +08:00
ZhangBiao 0259117f7b 【名字颜色】修改 2021-05-31 15:00:28 +08:00
zhangqiang a86b66a2eb 【十一星】英雄未获得详情报错修复 2021-05-31 14:46:56 +08:00
jiaoyangna 5ac8072007 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 14:22:54 +08:00
jiaoyangna 4a204eaba2 【无尽副本】在秘宝界面,刷新无尽副本,秘宝界面不关闭 2021-05-31 14:22:40 +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
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
gaoxin c90a961032 【音乐】story_1_2 修改 2021-05-31 11:29:02 +08:00
gaoxin 1b366fb607 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 11:07:06 +08:00
jiaoyangna 0d7f28a9fa 百宝修改提交 2021-05-31 11:06:23 +08:00
gaoxin 92a04cc440 【抽卡】修复第一次抽卡报错的问题 2021-05-31 11:06:20 +08:00
ZhangBiao f52b234e1b 【御兽斋】显示妖晶抽不足修改
(cherry picked from commit 4f406045a6)
2021-05-31 10:51:18 +08:00
jiaoyangna 7db0e3be54 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 10:47:02 +08:00
jiaoyangna 59c3bbf5ae 百宝 修改 2021-05-31 10:46:34 +08:00
jiaoyangna 05279cc3c1 Revert "小游戲修改提交"
This reverts commit ec83a6301a.
2021-05-31 10:41:12 +08:00
gaoxin 928a64f435 【物品】添加一个碎片类型 2021-05-31 10:37:50 +08:00
ZhangBiao df955dac39 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 10:28:32 +08:00
ZhangBiao 4f406045a6 【御兽斋】显示妖晶抽不足修改 2021-05-31 10:28:21 +08:00
zhangqiang 4ca111da25 【山河社稷图】数据修改 2021-05-29 23:14:16 +08:00
zhangqiang cfc4e57482 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 22:50:07 +08:00
zhangqiang 2c27d19046 【关卡属性提升】修改提交 2021-05-29 22:49:43 +08:00
ZhangBiao a1e7cb334a 【成长礼包】玉帝立绘下调 2021-05-29 22:49:24 +08:00
jiaoyangna acfc98c16f 延续时间修改 2021-05-29 22:47:20 +08:00
jiaoyangna b91e550147 百宝商会 提交 2021-05-29 22:16:50 +08:00
jiaoyangna 4898fb0ed7 百宝商会 修改提交 2021-05-29 21:56:10 +08:00
jiaoyangna 45307d2d3f 百宝商会提交 2021-05-29 21:42:41 +08:00
jiaoyangna 2666db8cf6 百宝商会修改提交 2021-05-29 21:31:39 +08:00
jiaoyangna 78f87d2b52 百宝商会 修改提交 2021-05-29 21:31:01 +08:00
jiaoyangna c08a8f2556 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 21:06:27 +08:00
jiaoyangna 37b818abb5 图片提交 2021-05-29 21:06:11 +08:00
ZhangBiao 5fbad73cbe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:48:14 +08:00
ZhangBiao 6ea9015bed 【修行】印记提交4 2021-05-29 20:48:07 +08:00
zhangqiang 028a31941f 【背包】背包中道具详情没有“使用”按钮 2021-05-29 20:44:43 +08:00
wangzhenxing b1fcc5d4e5 [限时活动,福利红包]=======bug修改 2021-05-29 20:36:26 +08:00
gaoxin e1759216d2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:25:57 +08:00
gaoxin 6fbec8a36e 【森罗幻境】转盘小游戏修复抽中非物品时报错的问题 2021-05-29 20:25:52 +08:00
jiaoyangna 9275f0f011 字修改提交 2021-05-29 20:22:55 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna e0089a98da Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:05:14 +08:00
jiaoyangna b071e12e29 秘宝描述修改 2021-05-29 20:04:48 +08:00
ZhangBiao cb13866ba7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 19:59:00 +08:00
ZhangBiao 19bce27f34 【修行】提交3 2021-05-29 19:58:52 +08:00
jiaoyangna 9c932e0d8c 积分修改 2021-05-29 19:56:09 +08:00
ZhangBiao 717b0039cb 【修行】印记提交2 2021-05-29 19:49:25 +08:00
ZhangBiao 62d78738ec Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 19:32:55 +08:00
ZhangBiao 1d4842a7d6 【修行】印记提交 2021-05-29 19:32:47 +08:00
gaoxin 41a923034d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 19:29:01 +08:00
gaoxin 90391d7255 【森罗幻境】转盘小游戏优化 2021-05-29 19:28:55 +08:00
ZhangBiao 749184a59a 【修行】提交 2021-05-29 19:22:35 +08:00
ZhangBiao 08b6f65f84 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 19:14:58 +08:00
ZhangBiao 4cfff84328 【修行】印记提交 2021-05-29 19:14:24 +08:00
jiaoyangna 6c5ab76379 無盡修改提交 2021-05-29 19:12:31 +08:00
jiaoyangna ae03663c79 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:52:59 +08:00
jiaoyangna 4bc9e9ddd8 百寶提交 2021-05-29 18:52:42 +08:00
zhangqiang f7be239ea7 【踏碎凌霄】排行榜 2021-05-29 18:37:45 +08:00
jiaoyangna 2b1356db5c 百寶商會 2021-05-29 18:36:27 +08:00
jiaoyangna 98b3a0caa2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:30:22 +08:00
jiaoyangna 14241e39df 無盡秘寶 提交 2021-05-29 18:29:50 +08:00
wangzhenxing a7de414589 [限时抽卡活动] 抽卡优化,奖励展示修改 2021-05-29 18:27:03 +08:00
ZhangBiao 07582f1918 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:17:49 +08:00
ZhangBiao 2fbbc6a52a 【修行】层级问题解决 2021-05-29 18:17:41 +08:00
gaoxin 1ecbe01f06 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:14:50 +08:00
gaoxin c15cf283ff 【跑马灯】修改跑马灯界面打开的位置 2021-05-29 18:14:11 +08:00
ZhangBiao ef4b272880 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:06:24 +08:00
jiaoyangna bff3c9b278 小游戲修改提交 2021-06-05 00:14:49 +07:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
jiaoyangna ec83a6301a 小游戲修改提交 2021-05-29 17:19:52 +08:00
jiaoyangna 4724c13023 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:34:20 +08:00
jiaoyangna 6a4d713949 無盡添加戰力 2021-05-29 16:34:00 +08:00
ZhangBiao eb156ad3cd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:29:09 +08:00
ZhangBiao 43e24114c6 【幸运探宝】跑马灯bug修改 2021-05-29 16:28:59 +08:00
wangzhenxing 60a49950c7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:26:38 +08:00
gaoxin 3a698539a9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:26:17 +08:00
gaoxin b20c824b8a 【资源】新增碎片框资源 2021-05-29 16:26:12 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
zhangqiang 01edf58ee5 【隐藏踏碎凌霄排行按钮】 2021-05-29 16:12:47 +08:00
ZhangBiao 15051ea6f9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:40:02 +08:00
ZhangBiao 2a552d0730 【踏碎凌霄】引导增加活动是否开启检测 2021-05-29 15:39:21 +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
gaoxin 1ea3890111 【战斗】报错优化 2021-05-29 15:21:41 +08:00
jiaoyangna 7149c17aef 小游戲加載圖片修改 2021-05-29 15:19:35 +08:00
jiaoyangna bccdcf6a98 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:06:55 +08:00
jiaoyangna d3098d3b3b 百寶 2021-05-29 15:06:31 +08:00
zhangqiang 4b289f571b 【关卡属性提升界面修改】 2021-05-29 15:06:16 +08:00
jiaoyangna 6ed366ecff Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 14:20:38 +08:00
jiaoyangna 51ead3f754 百宝修改提交 2021-05-29 14:20:21 +08:00
wangzhenxing ee90abf1b4 【公会】========加入宗门报错修改提交 2021-05-28 19:41:43 +08:00
jiaoyangna a694f95bac 森罗幻境】小游戏卡死 2021-05-28 19:25:43 +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 cb7a727901 【踏碎凌霄】排行榜 2021-05-28 18:26:01 +08:00
zhangqiang 46a7f519fb 【探索统计】复现步骤挂机满12小时不领,激活月卡立即前往,返回充值页面再返回主城 2021-05-28 17:40:42 +08:00
ZhangBiao 6df1668bc6 【八日登陆】第八日图片替换 2021-05-28 17:25:08 +08:00
wangzhenxing 53cbc08d48 [限时祈愿]=============抽卡修改 2021-05-28 16:54:40 +08:00
jiaoyangna e63200f4a2 预设修改提交 2021-05-28 16:26:12 +08:00
jiaoyangna 9e6c8248df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:22:15 +08:00
jiaoyangna 9be6ae227a 小游戏 修改提交 2021-05-28 16:22:04 +08:00
ZhangBiao aaf98b4cf0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:20:26 +08:00
ZhangBiao ea4662a447 【福星高照】bug修复 2021-05-28 16:20:14 +08:00
jiaoyangna 60903eb982 活动修改提交 2021-05-28 16:19:20 +08:00
jiaoyangna cc081e68d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:10:54 +08:00
jiaoyangna 68d39a1d5e 森罗修改提交 2021-05-28 16:10:44 +08:00
gaoxin 74d2dcfcbf Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:03:12 +08:00
gaoxin 9c0de19fd0 【注释】接口描述优化 2021-05-28 16:02:47 +08:00
jiaoyangna d165c87724 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-05-28 16:01:35 +08:00
jiaoyangna 7a104f9ff7 【主题活动累充】累充图标白篇且奖励间距不对 2021-05-28 16:01:03 +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
gaoxin afdbb49aca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:53:45 +08:00
gaoxin 05c3f30a7f 【资源】主界面活动按钮优化 2021-05-28 15:53:40 +08:00
ZhangBiao a7f4b320d7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:35:11 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
gaoxin 9e06f1994d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:20:35 +08:00
gaoxin 51d04d5526 【每日豪礼】修复红点不消失的问题 2021-05-28 15:20:22 +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
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
jiaoyangna d69164dd42 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:02:50 +08:00
jiaoyangna 33909a2f91 【旗开得胜】社稷赏商店购买限购商品到达上限后,页面不限时已售空,需要切换页签。 2021-05-28 15:02:17 +08:00
zhangqiang 9a4f1a64b2 【漏提】 2021-05-28 15:01:18 +08:00
jiaoyangna edd52b5eaa 【无尽副本】体力刷新倒计时结束后,页面计时显示不重置,退出重进显示正常 2021-05-28 14:45:42 +08:00
jiaoyangna 86e49bb7c0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 14:43:31 +08:00
jiaoyangna 1c7046260b 无尽新手引导 2021-05-28 14:43:27 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
gaoxin 9cce82f017 【SpriteLoader】修改初始化位置,兼容老包 2021-05-28 14:34:01 +08:00
gaoxin e0b0140609 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 14:32:49 +08:00
gaoxin 41fbecb79a 【优化】修复界面销毁后计时器报错 2021-05-28 14:32:42 +08:00
zhangqiang 63671cacbb 【修改图片加载方式 】 增加踏碎凌霄称号预设 没特效 2021-05-28 14:18:41 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
gaoxin fe996d3e54 【战斗】修复不满屏显示的问题 2021-05-28 13:36:36 +08:00
gaoxin d66ee3980d 【战斗】删除上部边框 2021-05-28 13:35:02 +08:00
gaoxin f1b5b0a97f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 13:31:11 +08:00
gaoxin 593a8cb398 【山河社稷图】猪八戒普攻后半身像显示不全 2021-05-28 13:31:06 +08:00
wangzhenxing fb9ced58fb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 12:37:06 +08:00
wangzhenxing 347341ca02 [福利]红包修改提交 2021-05-28 12:36:39 +08:00
jiaoyangna b78b006009 神将情报界面修改提交 2021-05-28 12:30:47 +08:00
jiaoyangna 8e1d427e2a 属性修改提交 2021-05-28 11:43:14 +08:00
jiaoyangna f76005afb7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 11:29:31 +08:00
jiaoyangna 81761b26af 无尽修改提交 2021-05-28 11:29:27 +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 2a21b80147 [限时祈愿]弹窗界面id修改 2021-05-28 11:05:50 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
jiaoyangna 5c3c32be15 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 10:35:13 +08:00
jiaoyangna d9773587a5 修改提交 2021-05-28 10:35:01 +08:00
ZhangBiao 6adde33bf8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 10:34:00 +08:00
ZhangBiao 458ab29053 【清除Log】清楚部分Log 2021-05-28 10:33:53 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
jiaoyangna 4b33fee287 红点修改提交 2021-05-28 10:20:13 +08:00
jiaoyangna f2c557c66e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 09:55:52 +08:00
jiaoyangna 89c667d314 无尽红点修改提交 2021-05-28 09:55:48 +08:00
gaoxin 613434d1fd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 23:33:08 +08:00
gaoxin 33efb7bc2a 【修行】亢龙有悔,东陵圣母大招没有眩晕敌方,没回怒
【修行】亢龙有悔神印,达摩连续追击,连续没眩晕,只第一次回了怒
2021-05-27 23:33:03 +08:00
zhangqiang 4bfbd360dd 【山河社稷图】特效层级调整 2021-05-27 23:20:09 +08:00
zhangqiang 9922678210 【山河社稷图】开启章节界面修改 2021-05-27 23:09:37 +08:00
jiaoyangna cde2379d78 常量重复修改 2021-05-27 22:43:50 +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
gaoxin cf287eabda 【资源】重复资源删除 2021-05-27 22:12:08 +08:00
gaoxin a1df6cbcf5 【战斗】尝试修复竞技场战斗报错 2021-05-27 22:11:06 +08:00
jiaoyangna 8e22dc72eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:49:41 +08:00
jiaoyangna 9ef020d022 重复资源修改提交 2021-05-27 20:49:35 +08:00
gaoxin 38e4008d81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:45:26 +08:00
gaoxin f5071a9845 【bug】修复战斗结算报错,修复挂机奖励提升白片 2021-05-27 20:45:20 +08:00
zhangqiang 0b2ef33938 【山河社稷图】特效修改提交 2021-05-27 20:29:05 +08:00
gaoxin 89c2517cc7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:24:58 +08:00
gaoxin d0b8f8db8e 【bug】修复报错 2021-05-27 20:24:33 +08:00
jiaoyangna d9c94e250f 删除log 2021-05-27 20:24:10 +08:00
jiaoyangna cb906bed77 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:19:29 +08:00
jiaoyangna 99d57b1497 怪物脚步声修改提交 2021-05-27 20:19:18 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
ZhangBiao 4b54176492 【协议提交】 2021-05-27 20:08:32 +08:00
ZhangBiao b0226b664f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 19:55:10 +08:00
ZhangBiao 13b222d998 【每日豪礼】可领取,没红点 2021-05-27 19:54:54 +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
jiaoyangna 20f117702c 无尽副本修改提交 2021-05-27 18:37:51 +08:00
gaoxin 916a777f59 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:30:56 +08:00
gaoxin 58aa9bce25 【嘿嘿】有个报错 2021-05-27 18:30:45 +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
jiaoyangna b1cf308eeb 无尽修改提交 2021-05-27 18:08:26 +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 59827fb333 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:50:56 +08:00
gaoxin cb367d4928 【排行榜】界面显示优化 2021-05-27 17:50:30 +08:00
ZhangBiao b5fa65a2fa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:41:15 +08:00
ZhangBiao b417d4eaa4 【修行】特效导入 2021-05-27 17:40:54 +08:00
gaoxin 21208dcf58 【挂机】金钱特效报错 2021-05-27 17:39:36 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
gaoxin 0ca658e6a4 【资源】新增法宝,物品资源 2021-05-27 17:16:30 +08:00
gaoxin 8bdf3b73bd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:53:10 +08:00
gaoxin 0ac40f3ce5 【战斗】精英副本战斗数据nodeId位置错误 2021-05-27 16:52:47 +08:00
zhangqiang fd964d842b 【提交】 2021-05-27 16:51:29 +08:00
gaoxin b25a6c01ff Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:51:20 +08:00
gaoxin 9b1a412eb8 【log】无用log删除 2021-05-27 16:50:49 +08:00
ZhangBiao 5d92af4aea Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:44:16 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
gaoxin 33505d1758 【资源】排行榜再优化 2021-05-27 16:42:28 +08:00
gaoxin c8a8683be0 【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星 2021-05-27 16:38:31 +08:00
gaoxin a1ba397b9c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:16:39 +08:00
gaoxin eaa3d5de88 【日常副本】跳过还原 2021-05-27 16:16:21 +08:00
zhangqiang ff837e338e 【山河社稷图小点】预设修改提交 2021-05-27 15:38:44 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 56463b82bb 【漏提】 2021-05-27 15:20:21 +08:00
jiaoyangna a9b52e6834 无尽副本修改提交 2021-05-27 15:16:46 +08:00
ZhangBiao 613a0744de 【资源】提交 2021-05-27 15:16:07 +08:00
ZhangBiao 25598e10d3 【音效】提交 2021-05-27 15:11:00 +08:00
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
ZhangBiao a6512d2778 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:44:59 +08:00
ZhangBiao f832ecfc33 【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡 2021-05-27 14:44:49 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
gaoxin d552721b88 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:38:14 +08:00
gaoxin af1ec6472a 【资源】技能字优化 2021-05-27 14:38:09 +08:00
ZhangBiao 0c78275a6e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:09:51 +08:00
ZhangBiao e615af9011 【福星高照】bug修改 2021-05-27 14:09:39 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
jiaoyangna 7d5ff8c3f1 设置按钮修改 2021-05-27 14:05:05 +08:00
gaoxin 19adbf944e 【每日礼包】资源修改 2021-05-27 14:02:53 +08:00
gaoxin 3870a1cec6 【竞技场】在线跨0点,免费次数不刷 2021-05-27 11:43:27 +08:00
gaoxin f9b93995f7 【资源】侵权替换 2021-05-27 11:32:12 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
gaoxin 249dd957de Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 11:16:30 +08:00
gaoxin 97e771bb65 技能文字导入 2021-05-27 11:16:16 +08:00
zhangqiang ac0feb82be 【bug】 2021-05-27 11:07:32 +08:00
gaoxin bccaf6557c 【巅峰赛】巅峰赛赛程界面报错 2021-05-27 11:04:44 +08:00
gaoxin 538c8d984e 【主界面】优化提示框层级问题 2021-05-27 10:47:04 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
gaoxin 7a972628c3 Merge branch 'china/dev' into china/dev-c 2021-05-27 10:19:53 +08:00
ZhangBiao e0a5d6d134 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 10:04:08 +08:00
ZhangBiao 7ddf0dd07f 【福星高照】按钮提交 2021-05-27 10:03:57 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
jiaoyangna b197244667 无尽副本修改提交 2021-05-27 09:46:56 +08:00
ZhangBiao 6677cac6d4 【主城】小人重复生成修复 2021-05-27 09:43:41 +08:00
ZhangBiao 5ce0867bd2 【修行】修行玩法里提升战力,排行榜战力刷新不及时 2021-05-27 09:28:10 +08:00
ZhangBiao 9d4ec4495d 【云游商人】无可替换装备时,去除二次弹窗,改为系统提示 2021-05-27 09:23:45 +08:00
jiaoyangna 5470197797 小怪正常战斗,结束时未弹出战斗结算界面 2021-05-26 22:56:53 +08:00
jiaoyangna 7baad945bf 无尽提交 2021-05-26 22:14:17 +08:00
jiaoyangna 35d0927881 无尽副本修改提交 2021-05-26 22:00:33 +08:00
jiaoyangna 92633b6913 秘宝修改提交 2021-05-26 21:58:48 +08:00
ZhangBiao 913bc640cd 【修行】大入口有红点,里面没有可操作的东西 2021-05-26 21:09:07 +08:00
ZhangBiao 35acdf34ef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 21:05:16 +08:00
ZhangBiao bc2c2eb916 【主城】主城小人,看不见自己, 2021-05-26 21:05:06 +08:00
jiaoyangna 736293cbe9 头像框颜色提交 2021-05-26 20:53:18 +08:00
zhangqiang 66c024eeae 【山河社稷图】bug 2021-05-26 20:47:41 +08:00
ZhangBiao e169ed3e9b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 20:31:18 +08:00
ZhangBiao 9ce432d885 【修行】神印未解锁不可查看 2021-05-26 20:31:01 +08:00
jiaoyangna 107d20677a 无尽副本提交 2021-05-26 20:27:39 +08:00
zhangqiang dbee1bef07 【山河社稷图】bug 2021-05-26 20:21:55 +08:00
zhangqiang aca4aa47ac 【音效修改】 2021-05-26 19:40:03 +08:00
ZhangBiao f7e8bd99b6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 18:32:14 +08:00
ZhangBiao 53703a8f2e 【修行】属性顺序 2021-05-26 18:32:03 +08:00
DESKTOP-98AVA47\Administrator 1f75672cb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 18:15:45 +08:00
DESKTOP-98AVA47\Administrator 0ad3913381 红点修改提交 2021-05-26 18:15:37 +08:00
jiaoyangna 8f6fce191b 无尽任务提交 2021-05-26 18:07:09 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
zhangqiang cf8fb5f147 【山河社稷图】bug 2021-05-26 17:24:58 +08:00
ZhangBiao d799a102dc 【灵兽推送礼包】主城没入口 2021-05-26 17:10:55 +08:00
ZhangBiao c9748421e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 17:04:03 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
gaoxin 8c7a65bd5b 【挂机】修复文字残留的问题 2021-05-26 16:39:23 +08:00
wangzhenxing 5cb0cf109f 协议提交 2021-05-26 16:08:59 +08:00
wangzhenxing b7eaf9a65a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 16:03:40 +08:00
wangzhenxing d821836909 福利红包修改提交 2021-05-26 16:03:28 +08:00
zhangqiang 945ee5a968 【bug提交】 2021-05-26 15:47:29 +08:00
zhangqiang 9322a8489a 【提交】 2021-05-26 14:59:25 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
ZhangBiao bc3c24c6b8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:44:49 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +08:00
gaoxin c5c3672a65 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:16:58 +08:00
ZhangBiao 1e495ac6db Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:48:42 +08:00
ZhangBiao b526f58bc3 【主界面】右上角调整 2021-05-26 13:48:33 +08:00
gaoxin 739ded2b11 【sdk】删除多余的字段 2021-05-26 13:44:39 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
gaoxin 0583113fb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:40:30 +08:00
gaoxin 4d934cc63c 【GM】位置移动 2021-05-26 13:40:08 +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 51576888a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 11:53:54 +08:00
ZhangBiao 5155b4aeb3 【主界面】提交 2021-05-26 11:53:45 +08:00
jiaoyangna e3c4ac2440 无尽副本战力修改提交 2021-05-26 11:52:32 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao bd1417f9aa 【修行】引导包修改 2021-05-26 10:42:19 +08:00
jiaoyangna 06f4a3be80 无尽副本界面修改 2021-05-26 10:29:34 +08:00
ZhangBiao a47268aa88 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 10:16:33 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
zhangqiang f8ddf0fbe6 【心魔试炼】提交 2021-05-26 10:00:30 +08:00
jiaoyangna 5ae6e53b49 士气等级提升图片提交 2021-05-26 09:59:28 +08:00
zhangqiang 281e19ad74 【心魔试炼】一键 2021-05-26 09:53:41 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
jiaoyangna 3846170f2d 属性提升界面修改提交 2021-05-25 21:40:41 +08:00
jiaoyangna 82787b2331 无尽编队修改 2021-05-25 21:27:38 +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 7353ddd09a 【心魔试炼】一键购买 2021-05-25 21:04:58 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
ZhangBiao 8d4d1aa777 【修行】第二短引导 2021-05-25 20:39:37 +08:00
jiaoyangna da6dd0283c 编队修改提交 2021-05-25 20:37:12 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
jiaoyangna a112127db0 无尽副本修改提交 2021-05-25 18:07:53 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
ZhangBiao d09ff174d2 【修行】取消玩家信息界面神印神将头像,练气期预览报错修改 2021-05-25 15:50:41 +08:00
ZhangBiao 1ab094facb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 15:00:07 +08:00
ZhangBiao d00e5f99a7 【修行】神印界面调整 2021-05-25 14:59:59 +08:00
zhangqiang 1848a666e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:53:41 +08:00
wangzhenxing 69d0f3ab39 公会福利红包修改提交 2021-05-25 14:52:02 +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 42b6dd4d7a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:54:32 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
jiaoyangna 80691b1a9e 限购次数修改提交
(cherry picked from commit f7235b087b)
2021-05-25 11:33:52 +08:00
jiaoyangna f7235b087b 限购次数修改提交 2021-05-25 11:22:30 +08:00
wangzhenxing 32b28f03eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:15:04 +08:00
wangzhenxing 1e82024f29 添加弹窗类型 2021-05-25 11:14:50 +08:00
ZhangBiao e3a45d34b5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:06:29 +08:00
ZhangBiao 1e2a932096 【修行预览、神将信息】 2021-05-25 11:06:20 +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
gaoxin 6a49d684e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:30:47 +08:00
jiaoyangna 5ceb07ca7d 删除图片提交 2021-05-25 10:30:32 +08:00
gaoxin e7c8d5290d 【仙缘抽】修复报错 2021-05-25 10:30:18 +08:00
jiaoyangna 919294b575 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:28:32 +08:00
jiaoyangna e12700bfa2 图片提交 2021-05-25 10:28:16 +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 5f9b35a66c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:07:42 +08:00
jiaoyangna c9c5480484 福星高照 提交 2021-05-25 10:07:31 +08:00
gaoxin caa32bac70 【红包】消息删除空格 2021-05-25 10:00:42 +08:00
gaoxin bfbc185604 【抽卡】仙缘汇聚箱加入山河社稷图星数条件 2021-05-24 20:33:26 +08:00
jiaoyangna 40fcabaf55 牛气冲天 提交 2021-05-24 20:26:53 +08:00
jiaoyangna 4452bb1d9a 音效提交 2021-05-24 20:22:38 +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
wangzhenxing 31a58128c1 退出公会黑屏bug修改 2021-05-24 18:27:13 +08:00
zhangqiang b728d3a396 【t3资源漏提】 2021-05-24 17:01:04 +08:00
gaoxin 563587e640 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 16:58:31 +08:00
gaoxin 24498b21a9 【公会】成员信息界面报错修复 2021-05-24 16:58:26 +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 e308fd0149 【主界面】修复update方法不能停止的问题 2021-05-24 16:24:16 +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
zhangqiang 41bf14a6ad 【山河社稷图】GM 2021-05-24 15:19:25 +08:00
jiaoyangna 6e90a19270 协议提交 2021-05-24 15:02:57 +08:00
jiaoyangna 34fd873ac4 修改提交 2021-05-24 15:00:38 +08:00
ZhangBiao 0332366e9d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 14:58:09 +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
gaoxin 4cc4bc87aa 【本地化】公告 2021-05-24 14:18:37 +08:00
gaoxin 4c02ba25cd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 14:16:52 +08:00
gaoxin 0f18eaf86c Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
#	Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
2021-05-24 14:15:30 +08:00
wangzhenxing 769042a739 master_test_gn协议提交 2021-05-24 14:14:11 +08:00
gaoxin acc2609df6 【本地化】公告 2021-05-24 14:09:11 +08:00
ZhangBiao fa051b65dc 【修行】QA增加 2021-05-24 13:58:30 +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
wangzhenxing d8bfab9427 称号 超凡入圣 图片特效贴图修改 2021-05-24 11:38:01 +08:00
DESKTOP-98AVA47\Administrator 2c870933d5 【充值】删除充值界面的文字显示 2021-06-03 00:31:34 +08:00
ZhangBiao 040f83f370 【修行】红点调整 2021-05-24 11:34:50 +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
wangzhenxing 368f6b7b64 超凡入圣称号特效贴图修改提交 2021-05-24 11:17:44 +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
zhangqiang 29622ac19a 【英雄小头像替换】 2021-05-22 17:58:47 +08:00
jiaoyangna 3bd06ba84b 【主题活动】活动商店背景图不正确,需要统一,类似社稷大典或乾坤宝盒商店这些商店等。 2021-05-22 17:17:43 +08:00
jiaoyangna f3e48f1d38 牛气冲天按钮提交 2021-05-22 17:10:16 +08:00
zhangqiang e404e26ffa 【山河社稷图】 2021-05-22 15:55:14 +08:00
zhangqiang a30616a9fc 【山河社稷图】修改 2021-05-22 15:26:30 +08:00
jiaoyangna 8719603f64 牛气冲天,福星高照修改 2021-05-22 15:20:51 +08:00