Commit Graph

10753 Commits (352de7108e2cc97ac75a593b3c812ff53953e6f7)
 

Author SHA1 Message Date
ZhangBiao 9f356783e1 【灵脉秘境】提交 2021-11-19 17:01:10 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +08:00
ZhangBiao 2ccc305041 Merge branch '0功能/灵脉秘境' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵脉秘境 2021-11-19 16:16:58 +08:00
skuld 2bd271390d bat Resource Commit:2021/12/02, 9:45:19 2021-12-02 09:45:20 +08:00
ZhangBiao 5e09e0b9a3 【灵脉秘境】切磋 2021-11-19 16:16:45 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
jiaoyangna b08dde6851 报错修改提交 2021-11-19 14:39:20 +08:00
jiaoyangna d69b3c8ca5 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-11-19 14:35:42 +08:00
ZhangBiao 42842f88bf 【灵脉秘境】资源提交 2021-11-19 11:47:41 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
jiaoyangna 9e99347a2b 法宝聚灵提交 2021-11-19 11:37:26 +08:00
jiaoyangna 808dcddc62 法宝聚灵界面1提交 2021-11-19 11:33:34 +08:00
wangzhenxing 1a623036fa [战斗]============禁甲图片提交 2021-11-19 11:30:42 +08:00
wangzhenxing 3d4211740c 【战斗表现】=========我方战中立绘缩放读取字段修改 2021-11-19 11:19:18 +08:00
wangzhenxing 9830c04a4b 【战斗】======御甲增加表现 2021-11-19 11:18:15 +08:00
wangzhenxing fc82b7bbc7 【战斗】======323 258 112 被动修改 2021-11-19 10:00:04 +08:00
ZhangBiao 9e507326fd 【灵脉秘境】提交 2021-11-19 09:38:41 +08:00
ZhangBiao 6454e84172 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 19:07:50 +08:00
ZhangBiao fc704b98c3 【灵脉秘境】资源提交 2021-11-18 19:07:19 +08:00
ZhangBiao c994c9e636 【灵脉秘境】提交 2021-11-18 18:43:22 +08:00
wangzhenxing 45bc2139a6 [战斗表现]=========我方前排血条位置修改 2021-11-18 18:37:14 +08:00
wangzhenxing b74561d70b [战斗表现]===============敌我前后排立绘缩放大小固定 2021-11-18 18:29:13 +08:00
gaoxin 670320141c 【战斗】初始怒气和爆伤减免的顺序交换 2021-11-18 17:17:53 +08:00
ZhangBiao 7d0a24a3cc 【灵脉秘境】提交 2021-11-18 17:15:16 +08:00
gaoxin cd291429f1 【坐骑碎片合成】删除无用代码 2021-11-18 16:05:26 +08:00
gaoxin 77c3376d82 【坐骑碎片合成】 2021-11-18 16:03:34 +08:00
wangzhenxing e705049135 【战斗】=======362修改 填加388-391被动 2021-11-18 16:02:16 +08:00
ZhangBiao 015341b7a6 【灵脉秘境】提交 2021-11-18 15:49:39 +08:00
ZhangBiao f79de8970c 【灵脉秘境】提交 2021-11-18 15:45:21 +08:00
wangzhenxing ad0e844852 [战中表现]========我方单位立绘大小读取字段修改 2021-11-18 15:44:16 +08:00
jiaoyangna efe7866916 身外化身添加属性显示 2021-11-18 15:39:00 +08:00
ZhangBiao 58d7a71faf 【灵脉秘境】提交 2021-11-18 15:14:39 +08:00
ZhangBiao a2a5d0f192 【灵脉秘境】提交 2021-11-18 14:39:50 +08:00
ZhangBiao 7f0720554f 【灵脉秘境】提交 2021-11-18 14:31:57 +08:00
gaoxin f5f2e9c7ef 【账号校验】大小写修改 2021-11-18 14:20:03 +08:00
ZhangBiao 79d2113bc2 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
ZhangBiao de7a516a87 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 13:30:03 +08:00
ZhangBiao 0722edb107 【灵脉秘境】提交 2021-11-18 13:29:26 +08:00
ZhangBiao 8125ed131e 【灵脉秘境】提交 2021-11-18 13:17:28 +08:00
jiaoyangna 4d887421ea 身外化身提交 2021-11-18 11:55:26 +08:00
ZhangBiao 03cdea5c83 【灵脉秘境】纪录提交 2021-11-18 11:35:20 +08:00
gaoxin 3565dc2b2a 【改名时上报事件】 2021-11-18 11:34:54 +08:00
wangzhenxing 666f33e9c9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-18 11:08:11 +08:00
wangzhenxing 071b7e62de [战斗]======被动362 修改 2021-11-18 11:06:19 +08:00
gaoxin ecedea90f8 Merge branch '0功能/新增克制属性' into china/dev 2021-11-18 10:49:34 +08:00
ZhangBiao e174e24bc1 【灵脉秘境】提交 2021-11-18 10:26:14 +08:00
wangzhenxing d87d9f621e [战斗表现]=======战斗界面卡牌显示修改 2021-11-17 18:37:43 +08:00
ZhangBiao 790fe1c88f 【灵脉秘境】提交 2021-11-17 18:28:59 +08:00
jiaoyangna c62b30d9cb 属性展示错误修改 2021-11-17 17:58:02 +08:00
wangzhenxing bf5f664fb8 [战斗]==========困难副本 禁疗不算控制 2021-11-17 17:36:20 +08:00