Commit Graph

6508 Commits (86679edd3e837bca806f6aa58b862b7a4c717bd6)

Author SHA1 Message Date
zhangqiang a0526542cf 【猕猴桃专服配置添加】 2021-06-08 21:01:59 +08:00
jiaoyangna 69bd345ed4 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 20:47:23 +08:00
jiaoyangna d91a94d309 【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
2021-06-08 20:47:03 +08:00
gaoxin 4876c365f3 【工具】添加灵动专服打包配置 2021-06-08 20:36:16 +08:00
jiaoyangna b85ddde17f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 20:27:19 +08:00
jiaoyangna 4d9d970907 【ID1009372】
点将台10连跳过保留橙将动画
2021-06-08 20:27:00 +08:00
gaoxin fad04ec385 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 19:29:35 +08:00
gaoxin c1ebbaa0b2 【sdk】修复sdk无法登录的问题,修改支付时的透传参数 2021-06-08 19:29:21 +08:00
jiaoyangna 4dfe018e82 【ID1009397】
四元阵增加置换玉获取提示
2021-06-08 18:19:14 +08:00
jiaoyangna 470e7c4430 【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
2021-06-08 18:07:22 +08:00
jiaoyangna 86f79bee97 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 17:58:43 +08:00
jiaoyangna 2ed4480d92 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-08 17:57:59 +08:00
gaoxin c2961f8f2d 【sdk登录】新增两个参数extData 和 p_appId 草花渠道使用 2021-06-08 17:27:24 +08:00
jiaoyangna 9681a00816 【ID1009395】
点将台增加剩余保底次数显示
2021-06-08 15:15:13 +08:00
jiaoyangna debd1f0a63 心愿抽卡 资源提交 2021-06-08 14:55:06 +08:00
gaoxin 1e3447f4d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 14:06:17 +08:00
gaoxin 498bc9a9b5 【称号】显示再优化,老包也能正常显示 2021-06-08 14:06:12 +08:00
jiaoyangna 7544256d4e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 11:40:58 +08:00
jiaoyangna 0d5c47f347 【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
2021-06-08 11:40:40 +08:00
gaoxin 52e975ccf6 【资源】重复名资源修正 2021-06-08 11:05:54 +08:00
gaoxin 8d6168a7d9 【称号】优化称号在老包中的显示 2021-06-08 11:04:11 +08:00
gaoxin be558c88f8 【特效】修复新称号特效显示错误 2021-06-07 21:28:45 +08:00
gaoxin 589795813b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 20:56:11 +08:00
jiaoyangna 24e2646bb8 心愿抽卡十连 报错修改 2021-06-07 18:06:23 +08:00
gaoxin 1b55441abc 【配置】新增草花渠道相关配置 2021-06-07 16:49:58 +08:00
jiaoyangna 3b5af67d93 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 16:45:03 +08:00
jiaoyangna 54cc26cb51 图片替换修改提交 2021-06-07 16:44:42 +08:00
gaoxin e971d8e96d 【资源】特效根节点transform正确性修复 2021-06-07 14:40:38 +08:00
ZhangBiao 21ba0c629d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 13:32:09 +08:00
ZhangBiao 6c31fa860d 【右上角活动】红点修改 2021-06-07 13:32:01 +08:00
gaoxin b3eaeb7eb5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 12:04:55 +08:00
gaoxin 6c23cb0069 【特效】蚩尤,崇黑虎特效优化,孙悟空,哪吒,玉皇大帝普通攻击特效添加 2021-06-07 12:04:50 +08:00
jiaoyangna 605073d7ec 无尽商店返回无尽副本关闭修改提交 2021-06-07 12:00:05 +08:00
jiaoyangna 4c7decb60b 礼包预设特效修改 2021-06-07 11:30:01 +08:00
ZhangBiao 88e8fe21f6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 11:18:47 +08:00
ZhangBiao a96a61ec77 【逐胜之巅】入口调整至左侧 2021-06-07 11:18:37 +08:00
gaoxin 6308f73308 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
2021-06-07 11:00:32 +08:00
JieLing 8d233c01eb 【禁言功能】 2021-06-07 10:57:05 +08:00
gaoxin 24ebb4cf9e 【热更工具】添加查看热更文件的界面 2021-06-07 10:39:27 +08:00
gaoxin b95a511dc2 【log】manager lateupdate 报错添加一些提示 2021-06-07 10:38:47 +08:00
gaoxin 0b5c529de4 【资源】特效资源修正 2021-06-05 15:19:43 +08:00
gaoxin 2db2a38484 【资源】蚩尤,崇黑虎特效资源上传 2021-06-05 15:10:02 +08:00
jiaoyangna c82afde747 删除log 2021-06-05 11:43:01 +08:00
jiaoyangna cbfe1db769 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:18:45 +08:00
jiaoyangna 46b4e3cd84 删除log 2021-06-05 11:18:13 +08:00
ZhangBiao f4e645df07 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:15:07 +08:00
ZhangBiao d744c010bf 【主城】红点 2021-06-05 11:14:36 +08:00
jiaoyangna 1912473cbe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:04:46 +08:00
jiaoyangna b5dda1e81c 剧情跳过修改提交 2021-06-05 11:04:28 +08:00
gaoxin 0e85d88c21 【剧情】修复连续跳过导致卡死的问题 2021-06-05 03:10:19 +08:00
gaoxin 9a6f978eee 【界面销毁时间修改为5秒】 2021-06-05 01:57:51 +08:00
gaoxin 3204bd5945 【upview】优化被关闭后依然可以通过事件触发报错的问题 2021-06-05 00:25:54 +08:00
gaoxin 518cb7dac1 【无用log】 2021-06-04 23:59:31 +08:00
gaoxin fe517d91ed 【红点】还原清空所有红点的操作 2021-06-04 23:56:09 +08:00
gaoxin 206fcf9d92 【红点】修复部分红点被错误清除的问题 2021-06-04 23:54:59 +08:00
gaoxin 97cb753d4e 【引导】没有引导的功能解锁时会导致报错 2021-06-04 23:31:39 +08:00
gaoxin 717994657e 【无尽副本】界面适配调整 2021-06-04 22:35:43 +08:00
gaoxin 7395441fa3 【UI】延长界面销毁时间 2021-06-04 22:34:40 +08:00
gaoxin 65b62e7116 【meta】 2021-06-04 22:34:10 +08:00
gaoxin 70d78be2f6 【更新界面】修改背景图的加载位置 2021-06-04 21:11:40 +08:00
gaoxin 770b4e57a5 【更新界面】删除背景处理 2021-06-04 20:35:33 +08:00
gaoxin 9c17db0f82 【登录】删除版号信息显示 2021-06-04 20:33:47 +08:00
gaoxin 1a14550cd7 【添加无损压缩的文件夹】 2021-06-04 20:31:58 +08:00
ZhangBiao a549f0c45b 【礼包】特效层级问题修改 2021-06-04 18:52:23 +08:00
ZhangBiao 39180183a9 【任务头像】红点问题修改 2021-06-04 18:41:32 +08:00
gaoxin 791233463b 【登录】更换登录图 2021-06-04 18:09:40 +08:00
gaoxin 22a4c87a5b 【背景图】优化背景图的大小 2021-06-04 18:06:44 +08:00
ZhangBiao f0cd4b3bc0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-04 16:10:28 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin d448c1189a 【登录】修复logo配置不生效 2021-06-04 16:09:52 +08:00
gaoxin b30359d2f5 【战斗】心魔试炼背景图修改 2021-06-04 15:17:43 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin c067b888d3 【登录视频】如果登录视频加载失败不再播放,战斗还原boss关卡不能跳过的功能 2021-06-04 14:53:37 +08:00
wangzhenxing 6158f0916a [福利红包]=====红包红点修改 2021-06-04 14:19:16 +08:00
gaoxin 9bb57b48a5 【 包配置】添加判空 2021-06-04 12:01:08 +08:00
gaoxin 50f10993c4 【包配置】不再使用包名进行配置 2021-06-04 11:49:12 +08:00
gaoxin bc65257ac7 【战斗】跳过提示修改为25级 2021-06-04 11:18:46 +08:00
gaoxin eda07761fc 【登录】尝试修复在登录界面无法使用sdk切换账号的问题 2021-06-04 10:47:07 +08:00
gaoxin f708fb6671 【登录视频】优化静态背景切换到视频的效果 2021-06-04 10:08:57 +08:00
gaoxin a83f6848a7 【闪屏】修复部分机型健康提示显示不全的问题 2021-06-04 09:49:08 +08:00
gaoxin 3eb84202f2 【登录】修改特效依然再喜扑的包里显示的问题 2021-06-03 23:03:09 +08:00
gaoxin 079afb4e8d Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e.
2021-06-03 22:37:30 +08:00
gaoxin 793bb12c8c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 21:32:49 +08:00
gaoxin 8451c96e70 【工具】添加多选文件工具 2021-06-03 21:32:44 +08:00
ZhangBiao 2f6fc30733 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 20:33:18 +08:00
ZhangBiao cc03866a03 【日常任务】红点问题修改 2021-06-03 20:33:08 +08:00
gaoxin 682d1a6b39 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:50:07 +08:00
gaoxin d20e47535e 【Debug】红点不消失问题debug日志添加 2021-06-03 19:50:02 +08:00
ZhangBiao f0dfe05e7b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:44:48 +08:00
ZhangBiao 326b790bcf 【抽卡】界面报错修改 2021-06-03 19:44:39 +08:00
zhangqiang 1933ffa809 【神将升级】满级还显示升级按钮 2021-06-03 19:38:22 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
gaoxin fb6338de41 【挂机】修复伤害数字不消失 2021-06-03 19:10:41 +08:00
gaoxin 5d9224bc72 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:51:11 +08:00
gaoxin 45351466ed 【log】删除一些无用log 2021-06-03 18:50:58 +08:00
jiaoyangna b758c30f09 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:47:14 +08:00
jiaoyangna b27430089a 【神将图鉴】猪八戒首次打开界面显示错误,报错(非必现) 2021-06-03 18:46:49 +08:00
gaoxin 092ab0e348 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:54 +08:00
gaoxin 327efb10d0 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:26 +08:00
ZhangBiao 46bdf8c271 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:19:23 +08:00
ZhangBiao 07a877bd4c 【牛气冲天】红点修改 2021-06-03 18:19:12 +08:00
gaoxin ec6404419d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:10:20 +08:00
gaoxin 02f02206ca 【循环滚动】修复快速切换报错 2021-06-03 18:10:15 +08:00
jiaoyangna 361a9b67ae Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:00:49 +08:00
jiaoyangna 6777d87a72 图鉴隐藏皮肤 2021-06-03 18:00:28 +08:00
ZhangBiao 1d697c5370 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:59:27 +08:00
ZhangBiao d19325ce7b 【公会红点】报错修改 2021-06-03 17:59:14 +08:00
zhangqiang 7a80a23435 【化虚坛】红点加功能开启判断 2021-06-03 17:56:58 +08:00
gaoxin e77c978e6e 【闪屏】删除猕猴桃 2021-06-03 17:46:38 +08:00
jiaoyangna 1400ebaddb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:43:24 +08:00
jiaoyangna b9336dbe7f 去掉对话背景 2021-06-03 17:43:07 +08:00
jiaoyangna 2a6fba6073 【无尽副本】地图跳转到商店。副本重置期间,还可以返回地图 2021-06-03 17:24:17 +08:00
gaoxin 44303e89d3 【音频】替换 2021-06-03 17:23:40 +08:00
jiaoyangna ab694c89f7 关闭解锁章节挂机界面 2021-06-03 17:09:30 +08:00
jiaoyangna fd6e00c757 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 16:51:55 +08:00
jiaoyangna dd0518b9a0 引导顺序修改 2021-06-03 16:51:36 +08:00
gaoxin 280ec50e34 【登录】报错 2021-06-03 16:07:38 +08:00
wangzhenxing 4644de33a5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 15:52:33 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
gaoxin adeeccdc84 【登录界面】特效只在特殊背景下显示 2021-06-03 15:44:28 +08:00
gaoxin 154cab45a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 15:08:10 +08:00
gaoxin 0f47dae77e 【资源】物品资源修改 2021-06-03 15:07:45 +08:00
jiaoyangna d92b951c3c 无尽任务进度修改 2021-06-03 15:01:48 +08:00
gaoxin 2f0208ec73 【工具】添加c-v2测试包配置 2021-06-03 14:39:36 +08:00
JieLing 44901a5410 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 14:37:36 +08:00
JieLing 1f5256afdf 【工具】打包工具优化 2021-06-03 14:37:28 +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
JieLing f50717ce27 删除视频文件加 2021-06-03 14:23:25 +08:00
gaoxin 6268827039 【战斗】首领关卡跳过功能打开 2021-06-03 14:19:45 +08:00
gaoxin 39fd13b7dc 【称号】主城他人称号特效不显示的问题 2021-06-03 14:01:39 +08:00
gaoxin 51eb62af65 【资源】新增一批功能提示按钮 2021-06-03 13:57:40 +08:00
gaoxin 9bd23a74cf 【登录视频】优化加载过程 2021-06-03 13:52:55 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
jiaoyangna 7c0a3dc57b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:41:28 +08:00
jiaoyangna 461f481bd8 配音提交 2021-06-03 11:41:08 +08:00
wangzhenxing 4f3aa3016a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:24:11 +08:00
wangzhenxing 200e48ed73 [称号]=====称号高度设置 2021-06-03 11:23:05 +08:00
gaoxin b27e2b8fb0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:21:04 +08:00
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
jiaoyangna df94ccee38 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:59:10 +08:00
jiaoyangna 5c778aad22 森罗幻境】试炼精气特效消失 2021-06-01 10:58:46 +08:00
JieLing e322108f26 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:56:50 +08:00
JieLing 4322ac35bd 【打包工具】调用GIT命令 2021-06-01 10:56:20 +08:00
jiaoyangna 1e4a316d3e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:50:38 +08:00
jiaoyangna d7947bcf75 关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方) 2021-06-01 10:50:22 +08:00
gaoxin 70bc51f319 【工具】自动打包工具GIT操作加入 2021-06-01 10:41:03 +08:00
JieLing 3e12b64118 【打包工具】修复拷贝提示错误 2021-05-31 21:54:13 +08:00
gaoxin 10deef53cf 【更新】更新界面背景加载方式修改 2021-05-31 21:36:05 +08:00
gaoxin 598b92f288 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 21:12:40 +08:00
gaoxin 9a98ff2e0a 【工具】拷贝过程添加界面显示 2021-05-31 21:12:34 +08:00
jiaoyangna 5bc754678e 报错修改 2021-05-31 20:39:46 +08:00
gaoxin d8ffbe8600 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 20:24:27 +08:00
gaoxin 595df075ed 【工具】打包工具优化 2021-05-31 20:24:15 +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
gaoxin 1bf055be80 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:29:21 +08:00
gaoxin 3645d39b93 【场景】添加喜扑入口场景 2021-05-31 15:29:10 +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 d311f479a4 【工具】热更工具添加 2021-05-31 11:24:20 +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