Commit Graph

5310 Commits (68658a50c913f933de97417b0f4ad2ddef6a2166)
 

Author SHA1 Message Date
zhangqiang 68658a50c9 【宝物分解】 2021-04-15 09:56:33 +08:00
gaoxin e013f396b3 【引导战斗】所有剧情放到战斗里 2021-04-13 15:10:40 +08:00
zhangqiang 412616ff78 【屏蔽称号页签】 2021-04-12 18:29:17 +08:00
ZhangBiao 833510e93e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 18:20:21 +08:00
ZhangBiao 73b3a2e268 【十五日登录】活动刷新延迟容错 2021-04-12 18:20:08 +08:00
gaoxin cdb9e35fd1 【config】修改serverversion = 0 2021-04-12 18:19:56 +08:00
gaoxin c338637ddc 【引导战斗】新的内容 2021-04-12 18:11:37 +08:00
gaoxin 867bcc62db Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 18:10:43 +08:00
gaoxin f56c620709 【假战斗】添加先后手配置 2021-04-12 18:10:39 +08:00
zhangqiang e6ca3f625d 【魂印】唯一限制的魂印会检测大闹天宫招募神将 2021-04-12 17:57:37 +08:00
ZhangBiao 4770fbae89 2021-04-12 17:14:57 +08:00
ZhangBiao e818791d38 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:07:59 +08:00
ZhangBiao 4ae91eda8e 【森罗幻境】修改数独小游戏的数字图片,将?居中 2021-04-12 17:07:27 +08:00
gaoxin 839a9e4d1d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:03:11 +08:00
ZhangBiao 0ded23ecde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 16:34:47 +08:00
ZhangBiao 216cf7839c 【森罗环境】将按钮的start改为中文“开始” 2021-04-12 16:34:38 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
gaoxin e02af6286e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 16:04:53 +08:00
gaoxin 56bf418509 Merge branch 'xma/dev' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua
2021-04-12 16:04:46 +08:00
ZhangBiao 42cd84f7aa 【十五日登陆】刷新时间提交
(cherry picked from commit 135e13dcbb)
2021-04-12 15:32:56 +08:00
ZhangBiao b088d21df4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-04-12 15:31:00 +08:00
ZhangBiao 135e13dcbb 【十五日登陆】刷新时间提交 2021-04-12 15:30:11 +08:00
jiaoyangna b26f09d6a3 添加不显示前往按钮的跳转 2021-04-12 15:12:12 +08:00
JieLing 9e0710a861 Merge remote-tracking branch 'origin/master_xma_local' into xma/dev 2021-04-12 15:11:16 +08:00
ZhangBiao e986b8d956 【十五日】
(cherry picked from commit 0e41801daf)
2021-04-12 15:06:57 +08:00
ZhangBiao 276e0129fe 【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed)
2021-04-12 15:06:43 +08:00
ZhangBiao 0e41801daf 【十五日】 2021-04-12 15:04:33 +08:00
JieLing 4ea8d525e1 Merge branch 'master_xma_test' into master_xma_local 2021-04-12 15:03:18 +08:00
ZhangBiao 8e0177d3ed 【十五日登陆】修改提交 2021-04-12 15:02:49 +08:00
JieLing 9cd895e8e9 【资源处理】meta文件提交,文件压缩优化 2021-04-12 15:00:57 +08:00
jiaoyangna 034ed82f0f 皮肤错误修改 2021-04-12 14:02:03 +08:00
JieLing 52a2ecabd6 【活动开启】提审服关闭日周月礼包 2021-04-12 10:46:32 +08:00
JLIOSM1 e99b368abb 【adjust】修复打点错误 2021-04-11 04:21:55 +08:00
JieLing e8dd8f9bea 【活动】未开启的活动页签不再显示 2021-04-11 02:14:55 +08:00
wangzhenxing ad9fdfd09e [战斗]==============大闹天宫同步最新战斗逻辑 2021-04-10 22:13:10 +08:00
wangzhenxing 450e2b412b [战斗]==================同步最新被动逻辑 2021-04-10 21:58:27 +08:00
JieLing be7e69d66b Merge branch 'master_xma_local' into master_xma_test 2021-04-10 19:43:07 +08:00
JieLing 169253497d Merge branch 'xma/dev' into master_xma_local 2021-04-10 19:42:42 +08:00
JieLing 9ffdf791ce Merge branch 'xma/dev-b' into xma/dev 2021-04-10 19:42:14 +08:00
gaoxin 798eedde7b 【adjust】包名修改 2021-04-10 19:22:13 +08:00
JLIOSM1 47a6118d81 【adjust】添加创建角色事件 2021-04-10 19:17:41 +08:00
gaoxin 52fb286afa 【本地化】修复第一次安装包时无法根据当前系统语言修改游戏内语言的问题 2021-04-10 19:08:57 +08:00
JieLing c0e722bec0 Merge branch 'master_xma_local' into master_xma_test 2021-04-10 18:52:07 +08:00
JieLing 8836fac87b Merge branch 'xma/dev' into master_xma_local 2021-04-10 18:51:39 +08:00
JieLing 3b0ba8f3d6 Merge branch 'xma/dev-b' into xma/dev 2021-04-10 18:50:52 +08:00
ZhangBiao 1981cc1836 Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b 2021-04-10 17:58:04 +08:00
ZhangBiao cc34d28e8d 【公会红包】报错修改 2021-04-10 17:57:49 +08:00
JieLing 4905938974 Merge branch 'master_xma_local' into master_xma_test 2021-04-10 17:47:08 +08:00
JieLing ea7282bbbb Merge branch 'xma/dev' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-04-10 17:23:38 +08:00
JieLing d49d33260e Merge branch 'xma/dev-b' into xma/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-04-10 16:44:39 +08:00