root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,875 Commits
38 Branches
2218 Tags
29 GiB
Commit Graph

6166 Commits (a96a61ec774b57be3c25d1b9fe5f3e614bcec708)

Author SHA1 Message Date
gaoxin 11d7cc3e89 【关卡】介绍文字修改 2021-06-03 11:20:53 +08:00
jiaoyangna 5e846c29f6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:00:11 +08:00
jiaoyangna 9b13236cfc 添加限制皮肤显示 2021-06-03 10:59:54 +08:00
gaoxin e8421f8223 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:43:10 +08:00
gaoxin 9e1d0b6bb7 【资源】新头像资源替换 2021-06-03 10:42:59 +08:00
jiaoyangna 9e2c3f60ac Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:40:47 +08:00
jiaoyangna 8e2feb0cd9 图片提交 2021-06-03 10:40:22 +08:00
gaoxin c9f17c4883 【登录视频】优化显示 2021-06-03 10:39:25 +08:00
jiaoyangna e50b59d005 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:39:21 +08:00
jiaoyangna eea172a5f6 特效层级修改 2021-06-03 10:38:37 +08:00
gaoxin 7273dce8a1 【登录视频】修改视频显示的位置 2021-06-03 10:36:11 +08:00
jiaoyangna 3c3ab0a8b8 图片修改提交 2021-06-03 10:06:24 +08:00
gaoxin 38d8d83dcd 【登录视频】从远端加载 2021-06-03 08:38:33 +08:00
gaoxin 865051dfb1 【资源】法宝资源优化 2021-06-02 21:46:12 +08:00
gaoxin 68b865c000 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:40:26 +08:00
gaoxin a61cd973b6 【立绘】优化 2021-06-02 21:40:22 +08:00
jiaoyangna ff531c4d4b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:32:40 +08:00
jiaoyangna d4cea59040 剧情跳过修改提交 2021-06-02 21:32:23 +08:00
wangzhenxing 232630b130 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:29:50 +08:00
wangzhenxing 5bd6093c18 [称号]====新称号shader 修改 2021-06-02 21:29:26 +08:00
gaoxin 79c20ee090 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:18:30 +08:00
gaoxin 5265470298 【音效】新增人物音效 2021-06-02 21:18:19 +08:00
jiaoyangna 138ab211e6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:16:58 +08:00
jiaoyangna ac3513e05a 无尽红点修改提交 2021-06-02 21:15:56 +08:00
gaoxin c5f60a10fe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:14:41 +08:00
gaoxin 23fb18745f 【立绘】资源优化 2021-06-02 21:14:24 +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
gaoxin 3dd3af7ade Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:07:24 +08:00
wangzhenxing 5cf037f6da [称号]=======聊天界面新称号显示修改 2021-06-02 21:07:02 +08:00
gaoxin c1ba528e09 【打包配置】添加视频文件夹 2021-06-02 21:06:58 +08:00
ZhangBiao 013a2b4951 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:04:53 +08:00
ZhangBiao de30eb3499 【登陆界面】视频卸载判空 2021-06-02 21:04:45 +08:00
jiaoyangna b82347e7eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:59:26 +08:00
jiaoyangna 2f9b8de4db 无尽编队修改提交 2021-06-02 20:59:02 +08:00
gaoxin d65a7fd11a 【称号】修复地图称号不显示 2021-06-02 20:53:49 +08:00
gaoxin f8931146a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:52:58 +08:00
gaoxin 1856d1003b 【立绘】精卫立绘修改 2021-06-02 20:52:54 +08:00
zhangqiang 935bae0f1c 【无尽副本】添加帮助和商店入口 2021-06-02 20:33:30 +08:00
gaoxin d65ec0fe2a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:26:02 +08:00
gaoxin 4d757a84d8 【资源】添加逍遥游预告icon 2021-06-02 20:25:50 +08:00
ZhangBiao a846715e1a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:25:30 +08:00
ZhangBiao ff79cf980c 【首充】报错修改 2021-06-02 20:25:20 +08:00
jiaoyangna 26cd24eba1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:21:33 +08:00
jiaoyangna 06cac292f2 每日豪礼 修改提交 2021-06-02 20:20:39 +08:00
ZhangBiao 131de8d9b9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:12:04 +08:00
ZhangBiao 4cc35be589 【牛气冲天】界面按钮调整 2021-06-02 20:11:37 +08:00
zhangqiang 6fc419abe5 【无尽副本】添加帮助和商店入口 2021-06-02 20:07:04 +08:00
gaoxin f8c2b74f0e 【资源】新增一些icon 2021-06-02 19:57:40 +08:00
gaoxin b7c8ed1ee1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 19:49:20 +08:00
gaoxin 6f6df7f5d6 【称号】在地图中删除称号上的canvas 2021-06-02 19:49:14 +08:00
gaoxin 5a849e7b17 【资源】立绘0043修改 2021-06-02 19:46:46 +08:00
gaoxin cf189bbbb6 【每日充值】文字替换 2021-06-02 19:45:24 +08:00
ZhangBiao 1ab5a831b4 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:29:24 +08:00
ZhangBiao 95b50d63d7 【登录界面】写在资源 2021-06-02 18:29:13 +08:00
wangzhenxing 6e2e88a930 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:26:56 +08:00
wangzhenxing 9bd4103768 【称号】====称号特效显示修改提交 2021-06-02 18:26:31 +08:00
jiaoyangna 2f2436697c 无尽关闭帮助界面 2021-06-02 18:22:45 +08:00
jiaoyangna a0d2d67624 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:20:59 +08:00
jiaoyangna 2534a2110b 无尽提交 2021-06-02 18:20:38 +08:00
ZhangBiao 93f44512bd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:08:13 +08:00
ZhangBiao 4ac7dd8159 【登陆界面】 2021-06-02 18:08:03 +08:00
gaoxin 1607b44fb8 【报错】 2021-06-02 18:02:21 +08:00
ZhangBiao b797a12a87 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 17:52:37 +08:00
ZhangBiao 1270be7823 【登录界面】增加视频 2021-06-02 17:52:26 +08:00
gaoxin c398659223 【立绘】精卫重做，地藏，迦楼罗，灵猫，罗刹，吕洞宾，木吒，改宽度，提交； 2021-06-02 17:45:52 +08:00
zhangqiang f265cb07ef 【山河社稷图】红点帮错 公会技能属性名称修改 2021-06-02 17:39:11 +08:00
gaoxin ecdbc7bc05 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 17:30:45 +08:00
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 8ec2d60c3f 【粒子特效】缩放接口不再对gameobject进行缩放 2021-06-01 18:08:40 +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
gaoxin 26511c3c5b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 11:05:20 +08:00
gaoxin 16eacf1a47 【打包工具】修改提交命令 2021-06-01 11:02:08 +08:00
gaoxin 8f29aa0cf8 【打包工具】添加是否要提交到GIt的判断 2021-06-01 11:01:04 +08:00