Commit Graph

8664 Commits (cef2b42bcc76dfc0a35970a7b2dba4ace24b5196)
 

Author SHA1 Message Date
ZhangBiao cef2b42bcc 【七界试炼】提交 2021-09-10 10:30:50 +08:00
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +08:00
ZhangBiao b05227f79e 【七界试炼】提交 2021-09-08 17:32:48 +08:00
ZhangBiao 2fe984719b 【七界试炼】遗物1/2 2021-09-08 16:26:40 +08:00
ZhangBiao 6ec532f769 【七界试炼】排行奖励 2021-09-08 14:36:37 +08:00
ZhangBiao 1693300255 【七界试炼】目标特性 2021-09-08 10:06:24 +08:00
ZhangBiao ea1b521143 【七界试炼】提交 2021-09-07 19:27:05 +08:00
ZhangBiao adb77b501e Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 19:26:13 +08:00
ZhangBiao db522d563e 【七界试炼】先显示界灵 2021-09-07 19:23:16 +08:00
wangzhenxing 03b2acbb91 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 18:45:25 +08:00
wangzhenxing c531b3776b 玉虚论道提交 2021-09-07 18:27:23 +08:00
gaoxin 2fa2fe0a28 【织女】live2d资源没有透明通道 2021-09-07 18:26:43 +08:00
ZhangBiao 8c95c7f8ad 【七界试炼】主界面基本完成 2021-09-07 18:09:33 +08:00
gaoxin 17db509837 【热更新】修改热更新配置文件 2021-09-07 18:02:40 +08:00
wangzhenxing 5f0bfe53bd 玉虚论道提交 2021-09-07 17:05:46 +08:00
gaoxin 8b57b7df1f 【逍遥游】西贺牛州选定区域优化 2021-09-07 15:42:05 +08:00
gaoxin 0bd0137a2b 【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log
2021-09-07 15:14:10 +08:00
gaoxin 79832f3232 【碎片详情】碎片详情添加灵兽和神将的查看 2021-09-07 11:40:12 +08:00
gaoxin b74d5ebf38 【资源】资源名重复 2021-09-07 10:27:09 +08:00
gaoxin b5ad62620f 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:41 +08:00
gaoxin 17ebbc1872 【优化】灵兽商城商品上显示当前已有的灵兽碎片 2021-09-06 18:19:45 +08:00
gaoxin b953fac2a0 【巅峰赛】选拔赛组界面添加角色信息展示 2021-09-06 17:58:31 +08:00
ZhangBiao 6078ae545a 【七界试炼】提交 2021-09-06 17:21:53 +08:00
gaoxin 59ec0d6f20 【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题 2021-09-06 16:35:46 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
ZhangBiao d3ee7eda1d 【七界试炼】资源提交 2021-09-06 11:42:32 +08:00
ZhangBiao 2d7ba67846 【七界试炼】提交 2021-09-06 11:37:49 +08:00
ZhangBiao d564f0cf11 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-06 11:16:40 +08:00
ZhangBiao a471905a9f Merge branch 'china/dev' into 0功能/七界试炼 2021-09-06 11:13:15 +08:00
gaoxin 65dfb661ad 【version】修复设置version文件失败的问题 2021-09-06 11:02:11 +08:00
gaoxin 17001dd7d8 【防沉迷】游戏内添加未成年人判断 2021-09-06 11:00:34 +08:00
gaoxin 7d8bb2bc36 【Version工具】修改配置文件走svn 2021-09-03 15:54:33 +08:00
ZhangBiao 1fbfcb13ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-03 15:10:47 +08:00
ZhangBiao 21d6b01106 【修行】元婴期突破空白文字修改 2021-09-03 15:10:38 +08:00
gaoxin b7151b0354 【version】先遣测试服登录服修改 2021-09-03 14:07:18 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 009a17a25a 【战力】漏提交 2021-09-03 10:19:51 +08:00
ZhangBiao 688da4bcb0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-03 09:52:08 +08:00
gaoxin 104100ad01 【还原图片优化工具】 2021-09-03 09:49:30 +08:00
ZhangBiao 5ea7acdef7 【幸运探宝】提交 2021-09-02 22:35:44 +08:00
ZhangBiao 72c42eb871 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 22:25:08 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
gaoxin 316adf6fbd 【登录】优化登录失败时,界面文字提示 2021-09-02 22:12:58 +08:00
ZhangBiao fbfa80611a 【幸运摊薄】时间显示 2021-09-02 20:58:11 +08:00
ZhangBiao f6d05b433d 【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致 2021-09-02 18:07:49 +08:00
gaoxin 45ddf4e09e 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 14:27:18 +08:00
jiaoyangna 1dd4e984cb 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-02 14:22:50 +08:00
jiaoyangna f087a9aa71 Revert "预设适配修改提交"
This reverts commit a592f4d5f3.
2021-09-02 14:20:26 +08:00
ZhangBiao d4f94b9d9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 13:44:51 +08:00
ZhangBiao 61c16f60f2 【优化】将竞技场赛季倒计时提示文字改为能看清的文字 2021-09-02 13:44:42 +08:00