Commit Graph

8747 Commits (88f88d1249f0b8af98b8f1253b48df7314ce89ae)
 

Author SHA1 Message Date
gaoxin 632fcab89d 【Version】文件夹还原 2021-08-24 17:08:08 +08:00
gaoxin 857b498420 【删除Version子模块】 2021-08-24 17:07:32 +08:00
JLIOSM1 4756f15a93 【热更工具】优化IOS更新卡死的问题 2021-08-24 16:04:06 +08:00
gaoxin 6f108e2f5c 【游戏帧率】默认修改为30帧 2021-08-24 15:34:50 +08:00
jiaoyangna ae15e4899a 协议提交 2021-08-24 14:34:24 +08:00
ZhangBiao 8af3d5aa39 【送神祠】 2021-08-23 20:59:30 +08:00
ZhangBiao 6fc59dbe11 【太初密卷】协议提交 2021-08-23 20:46:50 +08:00
ZhangBiao f0a0be43e6 【送神祠】灵兽分解 2021-08-23 19:45:53 +08:00
gaoxin 4f19f12612 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 19:37:10 +08:00
gaoxin 7b84324118 【出包工具】配置修改 2021-08-23 19:36:49 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
gaoxin 482d5371ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 15:48:06 +08:00
gaoxin 5c0696c7ac 【登录界面】修复隐私协议可以在全屏登录按钮上面的问题 2021-08-23 15:47:46 +08:00
ZhangBiao 87234641fa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 15:45:24 +08:00
ZhangBiao 1614afb3bf 【排序优化】修改神将界面中的排序规则 2021-08-23 15:45:10 +08:00
jiaoyangna 6ea8e96e59 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
2021-08-23 14:34:08 +08:00
jiaoyangna 6a36e5ffd3 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
2021-08-23 14:27:49 +08:00
jiaoyangna 16ca4f84d6 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
2021-08-23 14:27:41 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
Zhang Biao a7350e7f53 【修行】测试提交 2021-08-21 16:17:29 +08:00
gaoxin 259b43f2c6 【称号】修复踏碎凌霄称号IOS黑片问题 2021-08-20 22:40:10 +08:00
ZhangBiao 7d93e96d9b 【易经宝库】商店特效 2021-08-20 16:28:38 +08:00
wangzhenxing 9a02e18582 【战斗】==============被动 141 310 283 330 336 修改提交 2021-08-20 16:05:33 +08:00
ZhangBiao 6c2e75b384 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-20 14:40:19 +08:00
ZhangBiao 8ee8ec9dea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-20 12:01:23 +08:00
ZhangBiao 20451e4282 【灵兽山升级】战力上升和属性提升对不上,斜着显示 2021-08-20 12:01:17 +08:00
zhangqiang 864fd20aac 【神将召唤引导】当正好赶上两个神将加入卡池的时候,会有弹窗,但是弹窗蒙版会挡住引导按钮 2021-08-20 11:44:49 +08:00
zhangqiang 6ad43f93ed 【飘邈之旅】玩法入口文字错误 2021-08-20 10:56:14 +08:00
gaoxin f8cc4f5c73 【音效】治疗音效恢复 2021-08-19 21:02:34 +08:00
gaoxin 8f9f43adcb 【音效】缺失音效恢复 2021-08-19 20:29:43 +08:00
jiaoyangna 0a2b584ab0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-19 16:44:25 +08:00
jiaoyangna bb8ca3c5ca 四元阵跳转修改 2021-08-19 16:44:13 +08:00
gaoxin c1977b976c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-19 14:43:48 +08:00
gaoxin 6bcc7cf775 【战斗】修复部分普攻音效缺失 2021-08-19 14:43:43 +08:00
wangzhenxing 0e16c34677 [优化]==========聊天界面称号特效显示修改 2021-08-19 14:27:56 +08:00
ZhangBiao 11b5425f8b 【灵兽分解】分解完碎片后,显示错误 2021-08-18 17:53:52 +08:00
ZhangBiao 52bf5c79f2 【寻宝迷踪】增加音效 2021-08-18 15:31:52 +08:00
ZhangBiao 06b3814099 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-18 13:44:39 +08:00
ZhangBiao 30afec1613 【寻宝迷踪】预设冲突重新提交 2021-08-18 13:43:44 +08:00
jiaoyangna e2caaafbc5 删除log 2021-08-18 09:54:42 +08:00
ZhangBiao 2612c2e01e Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-08-17 19:53:05 +08:00
jiaoyangna c08ce1ea0b 【ID1018087】
【适配】十绝阵1080*2550,显示不全
2021-08-17 17:55:43 +08:00
jiaoyangna bc4af2601b 红点修改提交 2021-08-17 17:41:00 +08:00
jiaoyangna 662a760eaf 【ID1018142】
【宝物】宝物分解界面,没有精炼加号,统一 一下
2021-08-17 17:31:53 +08:00
jiaoyangna a23cd88b5b 【ID1018146】
【玲珑宝镜】外圈奖励显示10000与奖励预览不一致
2021-08-17 17:27:57 +08:00
jiaoyangna faf7591cf5 玲珑宝镜修改 2021-08-17 17:14:03 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
ZhangBiao a3ba14fe2c 【寻宝迷踪】增加动态例会 2021-08-17 13:35:03 +08:00
gaoxin 0efe76995b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 16:50:52 +08:00
gaoxin 090bd32b66 【Version】只显示配置文件 2021-08-16 16:50:48 +08:00