Commit Graph

7733 Commits (e304f2136b590c12a04c831cbfc113738d210ab1)

Author SHA1 Message Date
jiaoyangna 77949c23e6 商店背景蒙黑处理 2021-12-06 17:56:47 +08:00
ZhangBiao 9777eb5916 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 17:52:38 +08:00
ZhangBiao c367fc88f4 【易经宝库】珍奇宝阁无法进入修改 2021-12-06 17:52:27 +08:00
jiaoyangna d9f71e2f48 大闹天宫添加神魂等级 2021-12-06 17:47:14 +08:00
jiaoyangna b35bb40ff9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 17:26:23 +08:00
jiaoyangna 84a33a2a3e 十连抽停留位置修改 2021-12-06 17:26:03 +08:00
wangzhenxing 81e42565e4 [战斗]======被动395修改 2021-12-06 17:10:55 +08:00
ZhangBiao 78e8865e95 【连购礼包】提交 2021-12-06 16:59:10 +08:00
ZhangBiao 2c1300cb2d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:39:02 +08:00
ZhangBiao 19294fab2d 【连购好礼】购买限购礼包,次数不减,显示问题 2021-12-06 16:38:51 +08:00
jiaoyangna c83f294a67 跳转修改提交 2021-12-06 16:31:30 +08:00
jiaoyangna 6036916582 身外化身添加跳转 2021-12-06 16:22:13 +08:00
jiaoyangna 8b074afa67 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:04:31 +08:00
jiaoyangna 9ae56712c4 添加已获得标志 2021-12-06 16:04:01 +08:00
ZhangBiao bf520c66f2 Merge branch 'china/dev' into 0功能/命格 2021-12-06 16:02:27 +08:00
wangzhenxing 44643920ae 【战斗】======被动395 400修改 2021-12-06 16:00:50 +08:00
jiaoyangna da9b75ee80 商店添加 2021-12-06 15:53:01 +08:00
jiaoyangna a0440fa3ae 变身卡自选箱修改 2021-12-06 15:45:11 +08:00
jiaoyangna 2a3a22a997 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:43:24 +08:00
jiaoyangna 709f125845 商店修改 2021-12-06 15:43:05 +08:00
ZhangBiao 50d2066481 【零售特惠】跳转错误修改 2021-12-06 15:37:53 +08:00
ZhangBiao 022a3ee307 【命格】提交 2021-12-06 15:31:29 +08:00
ZhangBiao b88b0d9dce Merge branch 'china/dev' into 0功能/命格 2021-12-06 15:07:58 +08:00
ZhangBiao 10ad308033 【命格】提交 2021-12-06 15:07:34 +08:00
jiaoyangna c78b9d4e27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 14:51:31 +08:00
jiaoyangna fefd3a7fd5 变身卡修改提交 2021-12-06 14:51:13 +08:00
ZhangBiao 9aef11c828 Merge branch 'china/dev' into 0功能/命格 2021-12-06 14:41:44 +08:00
wangzhenxing 292df63308 【战斗】=======被动 187 276修改 2021-12-06 14:34:23 +08:00
ZhangBiao c8f664b93d Merge branch 'china/dev' into 0功能/命格 2021-12-06 14:24:56 +08:00
ZhangBiao 23be95a314 【命格】提交 2021-12-06 14:24:24 +08:00
ZhangBiao 06d532a9bc 【命格】开坑 2021-12-06 14:06:23 +08:00
jiaoyangna 88c10d8031 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 14:06:01 +08:00
jiaoyangna ab722baa35 变身卡修改提交 2021-12-06 14:05:43 +08:00
wangzhenxing acc1be3885 【战斗】=====buff图标显示销毁修改 2021-12-06 13:18:50 +08:00
ZhangBiao b433178b6e 【修行】结构更改 2021-12-06 11:57:08 +08:00
ZhangBiao 4434f9b615 【连购礼包】 2021-12-06 11:38:52 +08:00
ZhangBiao 3046512f77 【连购礼包】提交 2021-12-06 11:30:46 +08:00
ZhangBiao 981baa0fed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:23:42 +08:00
ZhangBiao d5bd38be25 【连购礼包】提交 2021-12-06 11:23:31 +08:00
jiaoyangna bc886f8bf3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:11:36 +08:00
jiaoyangna 0ca366cdf4 添加加号提交 2021-12-06 11:11:16 +08:00
ZhangBiao 1287c8f37c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 11:02:29 +08:00
ZhangBiao 7a43c51a48 【连购礼包】每日特惠修改 2021-12-06 11:02:15 +08:00
jiaoyangna 262f42a11b 文字修改提交 2021-12-06 10:26:43 +08:00
jiaoyangna 7e1cac4cbe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 09:58:25 +08:00
jiaoyangna 6309159f77 方寸寻宝修改提交 2021-12-06 09:58:04 +08:00
wangzhenxing e9f9010c12 【战斗】======被动401修改 2021-12-06 09:40:51 +08:00
wangzhenxing 010d68819f [战斗]=====buff显示id修改 2021-12-03 18:53:48 +08:00
wangzhenxing 2f7e5421a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:20:06 +08:00
wangzhenxing 40e639098b [战斗]======仙音环绕修改 2021-12-03 18:19:29 +08:00
jiaoyangna b19801639d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:03:53 +08:00
jiaoyangna 660bbdf997 方寸寻宝修改提交 2021-12-03 18:03:36 +08:00
wangzhenxing b9763ad25e 【战斗】=====变身卡提交 2021-12-03 17:17:47 +08:00
ZhangBiao 7348534847 【去除多余活动信息】 2021-12-03 16:46:40 +08:00
ZhangBiao f3f74c5ff1 【跨服战红点】灵脉被打跨服战没红点 2021-12-03 16:09:33 +08:00
ZhangBiao bf7dd87000 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 13:25:40 +08:00
ZhangBiao 8e7afd757d 【连购礼包】提交 2021-12-03 13:21:15 +08:00
wangzhenxing 94fd5fb5cf 【战斗】=======被动130修改 2021-12-03 10:27:41 +08:00
ZhangBiao ed5e0f6ab1 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 10:00:31 +08:00
ZhangBiao 4c7b379ce7 【灵脉秘境】1号灵脉的灵气数值超框 2021-12-02 19:49:49 +08:00
ZhangBiao ebff38ffc4 【连购礼包】提交 2021-12-02 19:36:28 +08:00
wangzhenxing d424af4e4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 17:43:00 +08:00
wangzhenxing bbef7796ca [战斗]=======第四期神魂 2021-12-02 17:42:31 +08:00
ZhangBiao 55f2e6e783 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-12-02 17:16:00 +08:00
ZhangBiao 4d1799a124 【连购礼包】提交 2021-12-02 17:13:33 +08:00
ZhangBiao bc69e64b81 【连购礼包】提交 2021-12-02 16:27:24 +08:00
jiaoyangna 43d40d90e1 【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
2021-12-02 15:55:08 +08:00
jiaoyangna 1253466912 天地烘炉提交 2021-12-02 15:18:56 +08:00
ZhangBiao f431eea90c 【连购礼包】提交 2021-12-02 14:03:38 +08:00
ZhangBiao cf971541e1 【大闹天宫】无法挑战修改 2021-12-02 10:35:06 +08:00
jiaoyangna e7cc7ee41e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-01 17:02:41 +08:00
jiaoyangna 40fcfcdfc2 化身描述修改 2021-12-01 17:02:25 +08:00
ZhangBiao c637166494 【灵兽宝阁】确认框错误修改 2021-12-01 16:55:05 +08:00
ZhangBiao 1725c1dc28 Revert "【战斗】白片尝试修改"
This reverts commit 0f8a995163.
2021-12-01 13:58:49 +08:00
ZhangBiao 0f8a995163 【战斗】白片尝试修改 2021-12-01 13:57:11 +08:00
ZhangBiao 1805fe0848 【装备】出售单个装备报错修改 2021-12-01 10:16:42 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 898f3a9b99 [立绘朝向]=======英雄列表初始化立绘朝向修改 2021-11-30 22:53:49 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
jiaoyangna bd379c4114 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-30 13:23:44 +08:00
jiaoyangna 12fb7447cc 坐骑合成修改 2021-11-30 13:23:29 +08:00
ZhangBiao 239d5bbb36 【log】日志调整 2021-11-30 11:19:28 +08:00
wangzhenxing bdb02e9fa4 [战斗]=====皮肤立绘朝向修改 2021-11-30 11:04:25 +08:00
wangzhenxing e1d75c6274 [战斗]=====增加目标筛选条件 2021-11-30 09:58:27 +08:00
jiaoyangna 5463dbe559 提示修改提交 2021-11-30 09:35:37 +08:00
ZhangBiao db1fd8cc9e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 18:26:02 +08:00
ZhangBiao 64e7aaac10 【百宝商会、灵兽特惠】提交 2021-11-29 18:25:39 +08:00
wangzhenxing a60c74720c 【战斗】=====查找逻辑修改 2021-11-29 18:16:49 +08:00
wangzhenxing 0cef7683ba [战斗]======效果137修改 立绘朝向修改 2021-11-29 17:53:17 +08:00
wangzhenxing ac32149aa8 [立绘朝向]=====皮肤,敌方立绘朝向修改 2021-11-29 17:07:28 +08:00
jiaoyangna 93eb328ddf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:41:34 +08:00
jiaoyangna 2e3fdd5e56 颜色修改提交 2021-11-29 16:41:04 +08:00
ZhangBiao 36dbd13c7d Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:37:36 +08:00
ZhangBiao 65461a4014 【灵兽特惠】跳转错误修改 2021-11-29 16:35:40 +08:00
jiaoyangna bce0b9b9ff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 16:35:39 +08:00
jiaoyangna ff48e4c11f 天地烘炉修改提交 2021-11-29 16:35:23 +08:00
wangzhenxing ea7e7d31be 【战中表现】======身外化身表现优化 2021-11-29 16:19:43 +08:00
wangzhenxing 6279110ddd 【战斗】=========目标选择逻辑修改 2021-11-29 16:07:32 +08:00
jiaoyangna 9070ad04ca 化身属性排序修改 2021-11-29 14:45:23 +08:00