Commit Graph

6508 Commits (86679edd3e837bca806f6aa58b862b7a4c717bd6)

Author SHA1 Message Date
jiaoyangna 8102e82829 资源提交 2021-06-17 19:33:16 +08:00
ZhangBiao 6ca32cdde3 【惊喜礼盒】提交 2021-06-17 18:50:19 +08:00
jiaoyangna 208c11555c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 18:17:42 +08:00
jiaoyangna c102ce2478 拍脸修改提交 2021-06-17 18:17:38 +08:00
ZhangBiao c9bf69310c 【升级豪礼】代码丢了,不是按照等级显示,需要重新修改 2021-06-17 18:05:39 +08:00
ZhangBiao bd4796a4af 【惊喜礼盒】右侧文字格式修改 2021-06-17 18:04:10 +08:00
jiaoyangna e5cacccd8a Merge branch 'china/dev-inner' into china/dev-c 2021-06-17 17:57:44 +08:00
jiaoyangna 687a9ea45d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 17:57:39 +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
jiaoyangna 4f115efb05 活动提交 2021-06-17 17:18:42 +08:00
ZhangBiao 87f3fa8f64 【惊喜礼盒】提交 2021-06-17 17:09:36 +08:00
gaoxin ac7501a1d5 【战斗】修复群体性的免疫效果不会正常消失的问题 2021-06-17 16:01:48 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna 6f5cd1d44a 惊喜礼包推送 2021-06-17 15:21:22 +08:00
jiaoyangna bc20fa57fc 惊喜礼包推送修改提交 2021-06-17 15:05:44 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
gaoxin 87032a513a 【配置】无用配置文件删除 2021-06-17 11:45:11 +08:00
gaoxin d06bdbadd1 【打包配置】修改商务服的打包分支 2021-06-17 11:21:05 +08:00
gaoxin 0138a9576f 【打包工具】添加根据分支判断要打的包,添加灵动商务服配置 2021-06-17 11:16:11 +08:00
gaoxin 562b57db73 【场景】新增猕猴桃商务出包场景 2021-06-17 10:59:20 +08:00
gaoxin 23c17edfc7 【包配置】删除对喜扑的包的特殊处理 2021-06-17 10:43:39 +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
zhangqiang 8f97c36580 【鸿蒙阵】共鸣是breakId 计算修改 2021-06-17 10:10:22 +08:00
JieLing 6431157671 Merge remote-tracking branch 'origin/gx/china/stream' into china/zf_test 2021-06-17 10:01:56 +08:00
JieLing a9685687a3 Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test 2021-06-17 10:01:30 +08:00
gaoxin b8f9d894d9 【登录】修复logo为空时显示默认logo的问题 2021-06-16 20:38:42 +08:00
ZhangBiao 814fb29c45 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-16 19:56:18 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
gaoxin 4f28f777b9 【添加包配置说明文件】 2021-06-16 18:55:11 +08:00
JieLing 447025cd5a Merge branch 'gx/china/stream' into china/zf_test 2021-06-16 18:47:22 +08:00
gaoxin 6bd67926e7 【包配置】优化登录界面的打开速度,添加登录界面视频背景配置字段 2021-06-16 18:46:46 +08:00
JieLing 18be3ba841 Merge branch 'gx/china/stream' into china/zf_test 2021-06-16 18:35:39 +08:00
gaoxin 3b68cd422f 【无用log】 2021-06-16 18:35:07 +08:00
JieLing 964c216ecc Merge branch 'gx/china/stream' into china/zf_test 2021-06-16 18:33:49 +08:00
gaoxin 6cf9492d06 【优化更新界面显示】 2021-06-16 18:23:30 +08:00
jiaoyangna 9f2e0dbfd0 【ID1009503】 每日豪礼文字重新包装 2021-06-16 18:05:57 +08:00
gaoxin c86cf619d0 【视频背景】尝试修复部分机型视频背景显示黑屏的问题 2021-06-16 17:30:54 +08:00
gaoxin 98b1518306 【添加stream配置】 2021-06-16 17:29:17 +08:00
jiaoyangna 27bfb84fb5 问号大小修改提交 2021-06-16 15:29:29 +08:00
jiaoyangna 0bfea18692 问号大小修改 2021-06-16 15:25:48 +08:00
jiaoyangna a35b9d404b 数字修改提交 2021-06-16 15:14:36 +08:00
jiaoyangna c5ecf50429 修改问号位置 2021-06-16 15:12:05 +08:00
zhangqiang aa666a5158 【公会】带神印的成员信息报错 2021-06-16 14:50:19 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
gaoxin fbd02f1a29 【工具】热更和打包工具完成后自动提交 2021-06-16 11:47:07 +08:00
gaoxin 0814f45cfa 【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加 2021-06-16 11:47:00 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
zhangqiang feb6480759 【章节剧情】点击跳过没有返回挂机界面 2021-06-16 10:53:21 +08:00
gaoxin 488f1e8af0 【stream】外部资源添加 2021-06-16 10:48:53 +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
gaoxin 67e44741f6 Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
2021-06-16 10:08:34 +08:00
ZhangBiao e0e8974850 【山河试炼】增加主城红点检测 2021-06-15 20:39:05 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
gaoxin ab11a7c233 【工具】热更和打包工具完成后自动提交 2021-06-15 15:23:05 +08:00
gaoxin 41dfe3f056 【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加 2021-06-15 14:46:30 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
zhangqiang 75cbaba02e 【章节剧情】点击跳过没有返回挂机界面 2021-06-15 12:17:13 +08:00
ZhangBiao 173fef6dca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-15 11:40:56 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
gaoxin 13d7b61e35 【神将信息】修复切换到装备界面返回无法切换页签的问题 2021-06-15 11:17:15 +08:00
ZhangBiao 6152c52f2c 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
gaoxin 46c1fb1070 【森罗】修复转盘游戏点击报错 2021-06-11 20:40:10 +08:00
gaoxin 2140a69391 【森罗】修复转盘游戏点击报错 2021-06-11 20:15:44 +08:00
gaoxin eb27240907 【热更】修复草花cdn报错 2021-06-11 19:26:20 +08:00
gaoxin 2a945825d9 【热更】修复草花cdn报错 2021-06-11 19:24:04 +08:00
gaoxin 57ece39059 【热更】添加草花和灵动专服的配置 2021-06-11 18:28:32 +08:00
gaoxin 8df099eabc 【资源】草花loading图替换 2021-06-11 18:28:05 +08:00
gaoxin c9d6c66259 【热更】添加草花和灵动专服的配置 2021-06-11 18:02:42 +08:00
gaoxin 0f68517a69 【资源】草花loading图替换 2021-06-11 17:37:32 +08:00
gaoxin 20dd0067d3 【资源】喜扑登录背景图替换 2021-06-11 16:11:01 +08:00
gaoxin 627a623a37 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 16:10:33 +08:00
gaoxin ebd4135226 【资源】喜扑登录背景图替换 2021-06-11 16:10:12 +08:00
jiaoyangna fe1570f667 神将详情界面修改提交 2021-06-11 16:09:42 +08:00
JieLing 8c161a0ddd Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test 2021-06-11 15:43:25 +08:00
ZhangBiao 4edff2eee8 【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7)
2021-06-11 14:10:10 +08:00
ZhangBiao 173773517f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 14:05:17 +08:00
ZhangBiao ca9a0199b7 【升级限量礼包】无剩余礼包逻辑缺失修复 2021-06-11 14:05:03 +08:00
gaoxin 3ba5186b7b 【热更】没有更新 files文件 2021-06-11 13:19:22 +08:00
gaoxin ee8577248e 【热更】没有更新 files文件 2021-06-11 13:16:55 +08:00
gaoxin 9ec33b5c6d 【热更】添加测试服和喜扑的配置 2021-06-11 13:04:29 +08:00
gaoxin 41af3c5db2 【热更新工具】 2021-06-11 13:04:22 +08:00
gaoxin 65e7971693 【热更】添加测试服和喜扑的配置 2021-06-11 13:02:12 +08:00
gaoxin 7cb79b4de3 【热更新工具】 2021-06-11 12:46:14 +08:00
wangzhenxing 588ca169c9 [战斗]======被动200去掉注释 2021-06-11 11:51:52 +08:00
zhangqiang a9ce0d077e 【章节剧情】点击跳过没有返回挂机界面 2021-06-11 10:58:51 +08:00
jiaoyangna ed4472a298 挂机卡死修改提交 2021-06-11 10:48:11 +08:00
jiaoyangna e89a0d26c8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 10:31:16 +08:00
jiaoyangna 2419089ff4 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:30:57 +08:00
jiaoyangna 11bb03fd2b 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:18:38 +08:00
gaoxin 06875b8986 【包配置】喜扑多渠道处理 2021-06-11 08:58:15 +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 e764f74e6d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 23:01:07 +08:00
jiaoyangna 65860bb337 删除剧情对话挂机地图音效 2021-06-10 22:59:26 +08:00
gaoxin 4ee928c2d4 Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c 2021-06-10 22:56:18 +08:00
JieLing 0f0ba0dfc2 【包配置】灵动正式服数数appid修改 2021-06-10 22:53:46 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
jiaoyangna b76f517cbb [战斗]===============被动200修改 同阵营这个被动只会触发一次 2021-06-10 22:08:51 +08:00
wangzhenxing 4165e6acd5 【战斗】=======注释之前被动200修改 2021-06-10 22:02:35 +08:00
wangzhenxing 77121e01e3 [战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个 2021-06-10 21:57:00 +08:00
jiaoyangna 83553d8aef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 20:17:03 +08:00
jiaoyangna 04633b4ece 无尽副本快速返回主城报错 2021-06-10 20:16:44 +08:00
zhangqiang 23f90ccf52 【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差 2021-06-10 18:37:16 +08:00
JieLing 2e798c6888 【资源名重复】 2021-06-10 18:24:59 +08:00
zhangqiang 5d57464da8 【森罗音效】福星高照老头的音效,界面关闭不停 2021-06-10 17:56:07 +08:00
jiaoyangna 529067bb2f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 17:44:20 +08:00
jiaoyangna e087d4c57c ID1016424】
【无尽副本】反复从无尽地图返回主城报错
2021-06-10 17:43:52 +08:00
zhangqiang 4915842ee2 【山河社稷图】奖励排序 2021-06-10 17:05:51 +08:00
jiaoyangna ddd0ece70b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:43 +08:00
jiaoyangna 819278dd3d 【ID1016436】
【无尽副本】战斗结算界面有经验
2021-06-10 16:38:19 +08:00
gaoxin fbe1acdf43 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:18 +08:00
gaoxin 8494dd02d7 【立绘错位】尝试修复神将卡牌上有时会出现立绘错位 2021-06-10 16:37:44 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
jiaoyangna 8115705d1a 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:30:49 +08:00
gaoxin 0458ee7bf7 【debug】修复部分报错导致报错的问题。。。 2021-06-10 16:11:02 +08:00
gaoxin 4382e822e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:10:18 +08:00
gaoxin aa4f3df8b0 【拍脸】优化短时间触发拍脸有可能导致报错的问题 2021-06-10 16:10:12 +08:00
jiaoyangna f5a9a1368d 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:08:26 +08:00
jiaoyangna fed713464c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:00:23 +08:00
gaoxin dd19b43dd6 【特效】修复特权商城扫光特效显示错误 2021-06-10 15:54:57 +08:00
jiaoyangna cd4232304a 【ID1016435】
【首充】修改“赠40连抽”文字
2021-06-10 15:54:21 +08:00
gaoxin 3f47beac93 【支付】透传参数添加cc值 2021-06-10 15:20:31 +08:00
gaoxin ad2c3b84df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 15:17:46 +08:00
gaoxin 43ae66d0d1 【音效】新增孙悟空,玉皇大帝,哪吒普攻特效,崇黑虎、蚩尤技能音效 2021-06-10 15:17:35 +08:00
gaoxin 0915c18368 【ID1009452】 增加森罗幻境老虎机音效 2021-06-10 15:16:17 +08:00
zhangqiang b3578a5ba4 【音效】跳转不同界面再返回,音效没有跟着切换 2021-06-10 14:50:28 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
gaoxin a943681b63 【工具】热更工具添加同步GIT的功能 2021-06-10 10:32:10 +08:00
gaoxin 5005b0975a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:30:42 +08:00
gaoxin 362e7ab9aa 【打包工具】修改出包的记录时间为24小时制 2021-06-09 20:30:10 +08:00
zhangqiang 8b4aa53984 【心魔试炼】3 2021-06-09 20:29:50 +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
jiaoyangna ad0da1e940 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:48:52 +08:00
jiaoyangna 7c1d58b3eb 青龙秘宝修改 提交 2021-06-09 18:48:24 +08:00
gaoxin bfb77649ba Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:29:14 +08:00
gaoxin d96a03bd57 【特效】修复崇黑虎技能显示错误 2021-06-09 18:27:55 +08:00
jiaoyangna cf47376987 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:24:56 +08:00