Commit Graph

7203 Commits (8efea1f06eca64c7022a33e589bab6a9ac08093a)

Author SHA1 Message Date
jiaoyangna 80fb3c9108 添加tips 2021-11-26 18:20:03 +08:00
jiaoyangna 129e2e5c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 18:10:18 +08:00
jiaoyangna 410fb55f66 天地烘炉提交 2021-11-26 18:10:02 +08:00
wangzhenxing 587a5cfc2e [战斗]=======133 136 137效果修改 2021-11-26 18:05:16 +08:00
jiaoyangna 4a82bcc664 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:54:55 +08:00
jiaoyangna 1a40cfba00 天地烘炉提交 2021-11-26 17:54:35 +08:00
gaoxin 0ddf804234 【战斗】战斗结构调整 2021-11-26 17:20:28 +08:00
wangzhenxing a6bf54daaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:08:20 +08:00
jiaoyangna 2814265ba7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:06:24 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
wangzhenxing 13e0ab29ba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 16:56:01 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
ZhangBiao ed45f56479 【主角】未到开启等级有红点 2021-11-26 16:44:01 +08:00
ZhangBiao 7e1039bf3b 【灵脉秘境】特效 2021-11-26 15:43:39 +08:00
ZhangBiao 5c7ba2529d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 15:15:23 +08:00
ZhangBiao b33ee1b006 【灵脉秘境】特效提交 2021-11-26 15:15:10 +08:00
gaoxin efe08520b9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 14:28:04 +08:00
gaoxin a9a402bd42 【战斗】再次优化护盾类特效的显示层级 2021-11-26 14:27:58 +08:00
gaoxin bb685191dd 【优化】设置物品显示的方法改为通用方法 2021-11-26 14:27:24 +08:00
gaoxin 62097d4d05 【红包】时间显示方法修改 2021-11-26 14:26:04 +08:00
jiaoyangna b63b619426 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 14:11:37 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
gaoxin 6b199a8b5a 【战斗】敌方怒气穿透 2021-11-26 14:06:19 +08:00
gaoxin 15b3718dd8 【测试战斗】添加一些特效配置的参数 2021-11-26 13:59:18 +08:00
gaoxin 21e7638a75 【特效】优化点对点特效的显示时间,优化特效层级错误的问题 2021-11-26 13:58:59 +08:00
gaoxin 71aa002b13 【战斗】前置特效添加延时 2021-11-26 13:58:24 +08:00
jiaoyangna c5fddcdf7a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 13:19:11 +08:00
jiaoyangna 14b54c7d5e 变身卡名字颜色修改 2021-11-26 13:18:45 +08:00
wangzhenxing 1da1d1457b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 13:08:37 +08:00
wangzhenxing 180d76f3b9 【战斗】========主角技能gm添加字段 2021-11-26 13:07:49 +08:00
jiaoyangna 838d7108bd 添加资源条 2021-11-26 13:07:45 +08:00
jiaoyangna 0d18d4595e 测试按钮关闭 2021-11-26 13:05:07 +08:00
jiaoyangna def89bf7e3 身外化身提交 2021-11-26 12:51:52 +08:00
jiaoyangna 2212df06ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:39:24 +08:00
jiaoyangna 1e17151d7f Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-11-26 11:35:57 +08:00
jiaoyangna 964a1b4fde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:34:57 +08:00
jiaoyangna b78e2335fa 身外化身提交 2021-11-26 11:34:25 +08:00
wangzhenxing bb1402d5e7 [战斗]======立绘方向修改 2021-11-26 11:24:46 +08:00
ZhangBiao 4c7268b11a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:09:30 +08:00
ZhangBiao c8fa05d5a0 【固定活动】提交 2021-11-26 11:09:22 +08:00
jiaoyangna c0c8a6710c 身外化身提交 2021-11-26 11:08:48 +08:00
gaoxin 5557795658 【轩辕宝镜】偶现跨0点报错 2021-11-26 10:53:49 +08:00
gaoxin f5f5a2477d 【战斗】怒气层级错误 2021-11-26 10:33:30 +08:00
gaoxin 878e8b095a 【森罗幻境】修复老虎机小游戏后音效播放错误 2021-11-26 10:29:12 +08:00
gaoxin 3a574880ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 10:19:35 +08:00
gaoxin ad3ca2e0d2 【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型 2021-11-26 10:19:29 +08:00
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao 7f525511c8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 09:54:21 +08:00
ZhangBiao 45df1fb982 【寻仙招募】增加心愿阵营条 2021-11-26 09:54:12 +08:00
wangzhenxing 5449b2357d [战斗]=====效果132修改 2021-11-26 09:36:41 +08:00
jiaoyangna 8a3ca0cb97 天地洪炉提交 2021-11-25 19:06:20 +08:00
jiaoyangna 34949242a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-11-25 18:57:48 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao db5627ab24 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 18:51:46 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
wangzhenxing 7949e8c21c 【战斗】========灵兽卡面翻转提交 2021-11-25 18:47:53 +08:00
wangzhenxing 6927b52365 [战斗]=======主角变身卡添加gm 2021-11-25 18:36:00 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao cb331c612e 【删除活动类那个43】 2021-11-25 16:51:35 +08:00
ZhangBiao d40b07138c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 16:16:48 +08:00
ZhangBiao bd4ce88486 【乾坤宝盒】报错修改 2021-11-25 16:16:39 +08:00
jiaoyangna a248330241 Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
2021-11-25 16:10:14 +08:00
gaoxin 458b7b2ca5 【灵兽】升级时,没有战斗力变化提示 2021-11-25 16:03:41 +08:00
ZhangBiao 2d76df2105 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:59:42 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
gaoxin 879cf506f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:43:15 +08:00
gaoxin 4923314bbb 【战斗】屏幕震动加入伤害延时时间 2021-11-25 15:43:10 +08:00
wangzhenxing aff13f8904 【战斗】======技能132-140提交 2021-11-25 15:07:40 +08:00
wangzhenxing b15eaf8b19 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:05:10 +08:00
wangzhenxing ae8021cd6a [战斗表现]========敌我方立绘镜像显示 2021-11-25 15:04:55 +08:00
gaoxin b316f54e50 【战斗】护盾特效层级问题优化 2021-11-25 14:46:46 +08:00
gaoxin 336321ebf3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 14:44:15 +08:00
gaoxin a36714d286 【战斗】跳过提示文字:第二回合结束后可以跳过 2021-11-25 14:44:10 +08:00
ZhangBiao 1c9d113a86 【活动、修为】界面调整 2021-11-25 11:52:35 +08:00
ZhangBiao 3ffefeea3c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 11:03:17 +08:00
ZhangBiao 855f658a93 【灵兽宝阁】错误修改 2021-11-25 11:03:08 +08:00
gaoxin 347cc3f9ba 【每日豪礼】资源68->98 2021-11-25 10:47:02 +08:00
ZhangBiao e4b0fd1824 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 18:14:37 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin 4607bd2fed Merge branch '0功能/账号id校验' into china/dev 2021-11-24 16:03:34 +08:00
gaoxin bb15f0056e 【战斗】弹道特效不在根据贝塞尔曲线运动 2021-11-24 14:42:11 +08:00
gaoxin d1ce54c9a9 【测试战斗】报错修复 2021-11-24 14:22:27 +08:00
gaoxin f01889db21 【战斗】改为第三回合时战斗就可以跳过 2021-11-24 14:21:44 +08:00
gaoxin 86dff44ce7 【主界面按钮】兼容删除了的活动 2021-11-24 11:43:46 +08:00
ZhangBiao 2d25ebb61b 【修为】修为调整 2021-11-24 11:30:55 +08:00
ZhangBiao 0e15c3d812 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 10:22:51 +08:00
ZhangBiao 18648a7622 【云游商人】装备文字叠加、显示人名错误修改 2021-11-24 10:18:36 +08:00
jiaoyangna 012847047e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 07:28:50 +08:00
jiaoyangna e947ab68b2 排行奖励切换奖励显示不正确修改 2021-11-24 07:24:17 +08:00
gaoxin 5462a1ad3b 【战斗】弹道特效转向 2021-11-23 17:23:35 +08:00
gaoxin 3f343bb1b2 【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过 2021-11-23 17:22:54 +08:00
wangzhenxing 9cce1aa31c 【战斗表现】======剧情特殊处理敌人名字位置 2021-11-23 15:13:43 +08:00
jiaoyangna 86bf793ba7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-23 14:01:00 +08:00
jiaoyangna 735b2dc404 法宝之灵展示修改 2021-11-23 14:00:36 +08:00
wangzhenxing b8b1c74f03 [战斗]========被动391修改 我方流血显示修改 2021-11-23 10:46:52 +08:00
jiaoyangna e88f1f7b01 【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
2021-11-23 10:31:09 +08:00
ZhangBiao 6cd26e96af 【灵脉秘境】纪录换行问题修改 2021-11-22 19:11:07 +08:00
ZhangBiao fbb58dbfdc 【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名 2021-11-22 18:44:32 +08:00
ZhangBiao bdc85fea41 【灵脉秘境】红点修改 2021-11-22 18:08:48 +08:00
ZhangBiao ba1201dd7a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:59:55 +08:00
ZhangBiao d06d3c6e2f 【灵脉秘境】红点判断 2021-11-22 17:59:46 +08:00
gaoxin 95382d530e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:37:38 +08:00
gaoxin 487c0d327a 【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印 2021-11-22 17:37:26 +08:00
wangzhenxing d9120676f7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:22:50 +08:00
wangzhenxing 134b1aff71 【战斗表现】============我方复活后血条不显示修改 2021-11-22 17:21:59 +08:00
ZhangBiao 232e965dbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:20:12 +08:00
ZhangBiao f4febd8ed8 【灵脉秘境】竞技场pvp切磋报错修改 2021-11-22 17:20:04 +08:00
wangzhenxing f67006e041 【战斗】============战斗超时pvp类型检测添加类型 2021-11-22 16:57:46 +08:00
ZhangBiao 9fe1e610ca Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:52:29 +08:00
ZhangBiao d688ae8ab9 【灵脉秘境】排行错误提交 2021-11-22 16:52:21 +08:00
gaoxin 66670029dc 【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题 2021-11-22 16:42:14 +08:00
jiaoyangna 21fa0c1762 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:38:43 +08:00
jiaoyangna 083d33b237 【ID1019215】
【坐骑合成】坐骑合成时拖动进度条可以把当前合成数量变成0,点击加号提示神将已达上限
2021-11-22 16:38:24 +08:00
wangzhenxing 3ec9fd80fd [战斗]======被动360 伤害公式修改只有神将才计算阵营伤害增减 2021-11-22 16:34:57 +08:00
gaoxin 7f68c39f91 【灵脉】回放跳过时战斗卡住 2021-11-22 16:28:36 +08:00
gaoxin f81914dfaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:13:30 +08:00
gaoxin d52ca13ff6 【战斗】关闭战斗类型打印 2021-11-22 16:13:06 +08:00
ZhangBiao 425d4934b8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 16:11:29 +08:00
ZhangBiao ab4faba301 【灵脉秘境】主动攻击不会产生红点 2021-11-22 16:11:21 +08:00
gaoxin e800f29b33 【竞技场】查看玩家信息报错 2021-11-22 16:06:52 +08:00
jiaoyangna 7722ede726 属性修改提交 2021-11-22 15:55:02 +08:00
jiaoyangna 5e8f8c59a1 添加底图 2021-11-22 15:48:54 +08:00
jiaoyangna ed5cd6ec59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 15:25:53 +08:00
jiaoyangna 9d2023c182 法宝之灵提交 2021-11-22 15:25:26 +08:00
wangzhenxing f980485ce2 [战斗表现]========足下阴影显示修改 2021-11-22 15:18:44 +08:00
jiaoyangna 9abd87c14b 战力添加 2021-11-22 15:06:44 +08:00
jiaoyangna 8bb17fa29c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 15:03:03 +08:00
jiaoyangna da218cfc3c 添加战力 2021-11-22 15:02:42 +08:00
ZhangBiao 99c4b8f81d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 15:00:54 +08:00
ZhangBiao 2428034e9d 【GM】增加一键法宝碎片 2021-11-22 15:00:46 +08:00
jiaoyangna 7647b0057e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 14:15:55 +08:00
ZhangBiao 025edbcacf 【灵脉秘境】界面修改、红点修改 2021-11-22 14:13:49 +08:00
jiaoyangna d239f69a98 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 14:12:08 +08:00
jiaoyangna 197b6f0d45 滑动修改提交 2021-11-22 14:10:54 +08:00
gaoxin f22f47202a 【太初密卷】获取网络图片错误时,无法进入游戏 2021-11-22 14:06:23 +08:00
gaoxin c33963f0b6 【点将台】修复新增心愿神将提示只在引导时显示的问题 2021-11-22 13:37:58 +08:00
ZhangBiao aa52131d3f 【灵脉秘境】文字遮挡、跳转 2021-11-22 13:27:54 +08:00
ZhangBiao cb80384f02 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 12:11:41 +08:00
ZhangBiao 421f82b882 【灵脉秘境】战斗报错修改 2021-11-22 12:11:28 +08:00
wangzhenxing 87f7602f9b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 12:02:22 +08:00
wangzhenxing ed8ef42849 [战斗]========被动112 258修改 2021-11-22 12:01:55 +08:00
gaoxin b10dad4285 【法宝聚灵】背包和掉落界面不显示碎片框 2021-11-22 12:01:16 +08:00
jiaoyangna 047e5cbe72 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 11:46:56 +08:00
jiaoyangna 0d073eb323 属性界面修改提交i 2021-11-22 11:44:48 +08:00
gaoxin f78031984a 【背包】法宝聚灵页签添加 2021-11-22 11:18:28 +08:00
jiaoyangna e61de063cf 法宝聚灵修改提交 2021-11-22 11:01:43 +08:00
jiaoyangna 7074527619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 10:39:10 +08:00
jiaoyangna cefbc9b8dc 属性加成错误显示修改 2021-11-22 10:38:54 +08:00
wangzhenxing f10d6ee2a1 [玉虚论道]======保存队伍时添加相同英雄检测 2021-11-22 10:18:39 +08:00
jiaoyangna 5684d23328 红点修改 2021-11-19 18:54:16 +08:00
jiaoyangna e722bf90d4 属性显示错误修改提交 2021-11-19 18:51:18 +08:00
jiaoyangna 18968609a6 属性显示错误修改 2021-11-19 18:49:52 +08:00
jiaoyangna ff71fb378e 属性显示错误修改 2021-11-19 18:48:18 +08:00
jiaoyangna 2978dc203c 添加特效,添加点击事件 2021-11-19 18:32:22 +08:00
jiaoyangna db0fcea43e Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-19 18:01:59 +08:00
ZhangBiao 85c8028bc5 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-19 17:57:09 +08:00
ZhangBiao f1737b1c5d 【灵脉秘境】提交 2021-11-19 17:48:56 +08:00
wangzhenxing 2cf0c5afde [战斗]=======被动310,391修改 2021-11-19 17:39:43 +08:00
gaoxin d95530acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-19 17:29:45 +08:00
gaoxin 9ce1d26fa9 【战斗】添加一些战斗类型 2021-11-19 17:29:40 +08:00
jiaoyangna 91dfe3131d 灵兽宝阁进度icon点击显示错误修改
(cherry picked from commit 2de1c704f0)
2021-11-19 17:29:07 +08:00
jiaoyangna 2de1c704f0 灵兽宝阁进度icon点击显示错误修改 2021-11-19 17:28:20 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
gaoxin ab9408b485 【战斗】后端被动和主动技能id格式转换成数字,可能导致战斗不一致 2021-11-19 17:21:01 +08:00
jiaoyangna 467dd1aebb 添加特效提交 2021-11-19 17:08:14 +08:00
ZhangBiao 9f356783e1 【灵脉秘境】提交 2021-11-19 17:01:10 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +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 c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
jiaoyangna 808dcddc62 法宝聚灵界面1提交 2021-11-19 11:33:34 +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