Commit Graph

10427 Commits (6d93ab7dca8f45e72178fb2ffa0a7ff34d423cb2)

Author SHA1 Message Date
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 306e52d2d3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:24:26 +08:00
jiaoyangna 6036916582 身外化身添加跳转 2021-12-06 16:22:13 +08:00
wangzhenxing 06948fe7fd [战斗]======人系普攻特效修改 2021-12-06 16:18:50 +08:00
ZhangBiao 0d11371d87 【资源冲突】资源名修改提交 2021-12-06 16:15:24 +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
wangzhenxing 44643920ae 【战斗】======被动395 400修改 2021-12-06 16:00:50 +08:00
jiaoyangna df51b91fb0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:54:18 +08:00
jiaoyangna da9b75ee80 商店添加 2021-12-06 15:53:01 +08:00
luyao 1199b225cd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:46:42 +08:00
jiaoyangna a0440fa3ae 变身卡自选箱修改 2021-12-06 15:45:11 +08:00
luyao 83044f0586 Merge branch 'china/dev' into china/dev_res 2021-12-06 15:43:40 +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
luyao 45cf7e0ea6 牛魔王【气冲斗牛】技能字 2021-12-06 15:02:42 +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
wangzhenxing 292df63308 【战斗】=======被动 187 276修改 2021-12-06 14:34: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
JLIOSM1 2714a8c8f6 【AB加密】修复游戏内无法加载files文件的问题,优化splashpanel的判断方式 2021-12-06 13:44:49 +08:00
JLIOSM1 28dbfe57eb 【打包工具】添加IOS打包工工具的部分功能 2021-12-06 13:44:44 +08:00
JLIOSM1 f46357527d [IOS]xipu包接口适应 2021-12-06 13:44:38 +08:00
zhangshanxue 6b506a2482 【AB加密】路径错误 2021-12-06 13:44:33 +08:00
zhangshanxue cfeedca679 【AB加密】Android不再进行加密 2021-12-06 13:44:26 +08:00
zhangshanxue 2d73b2d13a encrypt 2021-12-06 13:44:21 +08:00
gaoxin 6a817f1b01 【AB加密】加密工具代码提交 2021-12-06 13:44:14 +08:00
gaoxin b6c01c82cf 【热更工具】cdn上没有时上传全部 2021-12-06 13:44:09 +08:00
gaoxin a3093c2d3e 【打包工具】选中时再显示按钮 2021-12-06 13:44:03 +08:00
gaoxin d154dc9248 【AB加密】解密方法提交 2021-12-06 13:43:57 +08:00
luyao a9ecbeaddd 方寸商店meta文件。及 牛魔王【气冲斗牛】技能字 2021-12-06 13:40:25 +08:00
luyao c4555d808f 【方寸商店】文字上传 2021-12-06 13:33:55 +08:00
wangzhenxing acc1be3885 【战斗】=====buff图标显示销毁修改 2021-12-06 13:18:50 +08:00
ZhangBiao 6bf98e7c9f 【修行】结构修改 2021-12-06 13:02:18 +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 2c83c873b9 时间修改提交 2021-12-06 10:32:31 +08:00
jiaoyangna 262f42a11b 文字修改提交 2021-12-06 10:26:43 +08:00
wangzhenxing 35784b8228 【特效】======牛魔王皮肤特效修改 2021-12-06 10:22:34 +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
ZhangBiao 011c8d7f5d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 19:01:27 +08:00
ZhangBiao e2ec6d9765 【连购礼包】奖励靠左 2021-12-03 19:01:17 +08:00
wangzhenxing 010d68819f [战斗]=====buff显示id修改 2021-12-03 18:53:48 +08:00
wangzhenxing 402546b8ef 【战斗】=====buff图标提示文字资源提交 2021-12-03 18:34:40 +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 13991ac0de Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 16:09:49 +08:00
ZhangBiao f3f74c5ff1 【跨服战红点】灵脉被打跨服战没红点 2021-12-03 16:09:33 +08:00
luyao c7edbfc191 【音效调整】揭开大圣符印部分音效声量调大 2021-12-03 14:54:08 +08:00
ZhangBiao ee5c9d7362 【连购礼包】资源文件 2021-12-03 13:34:44 +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 8ccea4cf70 [资源]======牛魔王皮肤 头像 卡牌资源提交 2021-12-03 11:30:55 +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 0bf844b8d8 【大闹天宫】无法挑战修改 2021-12-03 09:52:46 +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 aa0e501b4b ID1019319】
【神将情报】神将到达330级时情报右侧显示提示应为“最高等级”
2021-12-02 16:01:01 +08:00
jiaoyangna 43d40d90e1 【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
2021-12-02 15:55:08 +08:00
jiaoyangna 7b8306f98a 【ID1010715】
【公会信息优化】公会名称底框右侧添加编辑图标
2021-12-02 15:31:23 +08:00
jiaoyangna 1253466912 天地烘炉提交 2021-12-02 15:18:56 +08:00
wangzhenxing db8beee485 [特效]=======人系施法过程特效修改 2021-12-02 14:48:45 +08:00
ZhangBiao 0b5575c6f2 Merge branch 'china/dev' into china/dev_res
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
#	Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
2021-12-02 14:39:03 +08:00
ZhangBiao 73d0e79bb1 【连购礼包】资源文件 2021-12-02 14:18:21 +08:00
ZhangBiao f431eea90c 【连购礼包】提交 2021-12-02 14:03:38 +08:00
wangzhenxing bca44801ef 【特效】=====牛魔王皮肤特效 人系特效弹道修改 2021-12-02 13:10:54 +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 63bf32f335 【战斗】白片尝试修改 2021-12-01 13:59:22 +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
luyao ed655ea6a7 【优化】
白素贞小头像、半身像
炼丹师半身像
朝向左>右
2021-12-01 09:20:55 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 898f3a9b99 [立绘朝向]=======英雄列表初始化立绘朝向修改 2021-11-30 22:53:49 +08:00
gaoxin 2e2c4292b6 【引导】修复修为引导位置错误 2021-11-30 21:27:26 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
luyao af560c2aed 【音效文件清理】删除过往无用音效 2021-11-30 14:23:18 +08:00
luyao cf3993fbfb 妖系 受击音效调整 2021-11-30 14:12:35 +08:00
gaoxin f090e9b792 【特效】哪吒技能特效时间优化 2021-11-30 13:42:49 +08:00
gaoxin 9fdf7687fa 【特效】哪吒技能特效时间优化 2021-11-30 13:42:14 +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
luyao f4a440e1a3 【妖】普攻 受击音效再次调整 2021-11-30 12:35:45 +08:00
luyao 1dc75e4580 【妖】普攻 攻击,受击音效;
【道】受击音效修改
2021-11-30 12:15:37 +08:00
luyao 7a8c43ed57 添加 人(攻击,受击)、佛(攻击、受击) 普攻音效 2021-11-30 11:37:49 +08:00
gaoxin 25c9e3472a 【场景】quick新母包场景创建 2021-11-30 11:23:31 +08:00
ZhangBiao 239d5bbb36 【log】日志调整 2021-11-30 11:19:28 +08:00
wangzhenxing bdb02e9fa4 [战斗]=====皮肤立绘朝向修改 2021-11-30 11:04:25 +08:00
luyao 75cd2cf3a3 九命猫、逍遥客小头像翻转方向 左>右 2021-11-30 10:28:16 +08:00
luyao 158b202788 通天教主小头像方向反转左>右 2021-11-30 10:26:48 +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
gaoxin 95251dd5e1 【特效】牛魔王特效显示优化 2021-11-29 17:42:55 +08:00
jiaoyangna 658a655f2c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 17:18:06 +08:00
jiaoyangna 76a94a227e 文字大小修改 2021-11-29 17:17:50 +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
gaoxin 5906482cca Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 15:57:59 +08:00
gaoxin bead1c571a 【对话】显示异常修复 2021-11-29 15:57:54 +08:00
jiaoyangna 9070ad04ca 化身属性排序修改 2021-11-29 14:45:23 +08:00
jiaoyangna fbf47dbd61 添加天地烘炉读表设置 2021-11-29 14:39:43 +08:00
jiaoyangna c71616be27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 14:39:15 +08:00
jiaoyangna dae57bb8ee 添加天地洪炉法宝碎片读表设置 2021-11-29 14:38:57 +08:00
ZhangBiao 3cf80812c0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 14:08:16 +08:00
ZhangBiao b90afb39f2 【灵兽特惠】提交 2021-11-29 14:08:07 +08:00
gaoxin c035221989 【剧情】立绘和文字出现的节奏调整 2021-11-29 13:50:29 +08:00
ZhangBiao 38f70b2c8d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:41:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
skuld 42923df528 bat Resource Commit:2021/12/08,15:42:15 2021-12-08 15:42:16 +08:00
wangzhenxing 2c6282e883 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:21:52 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
gaoxin 6c6ce74081 【立绘】伏羲立绘删除脚下的阵 2021-11-29 13:20:45 +08:00
gaoxin 2b642464a5 【立绘】伏羲立绘删除脚下的阵 2021-11-29 13:19:29 +08:00
gaoxin 40a2898ab0 【资源】普通特效优化 道 2021-12-02 01:56:37 +08:00
jiaoyangna e92063853e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 10:15:07 +08:00
jiaoyangna d931fa07f8 身外化身重复修改提交 2021-11-29 10:14:52 +08:00
luyao c7ee28efc7 【神将朝向】逍遥客 左>右 2021-11-29 10:00:10 +08:00
luyao f68f821c03 【朝向调整】九命猫t3牌 左>右 2021-11-29 09:48:20 +08:00
jiaoyangna c2638629e7 化身两个修改提交 2021-11-29 09:40:41 +08:00
gaoxin 030fea312a 【立绘】立绘回收时,方向还原 2021-12-02 04:34:30 +08:00
gaoxin b8137b0d7c 【点将台】尝试修复山河社稷图黑屏 2021-12-02 04:33:57 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
luyao 5deba7853a 【资源】头像转向 2021-11-27 19:47:34 +08:00
gaoxin 7c9741c522 【资源】普通特效优化 道 2021-12-02 01:56:56 +08:00
gaoxin 0efa821585 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:44:34 +08:00
gaoxin 0d1c025624 【活动】连续礼包,添加 2021-12-02 01:44:29 +08:00
gaoxin 28538e89b0 【GM】添加剧情测试的GM 2021-12-02 01:13:52 +08:00
gaoxin 2a98efbaad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:08:51 +08:00
gaoxin d5d83a5c7e 【资源】资源名重复修改 2021-12-02 01:08:38 +08:00
gaoxin c8a1f45b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:07:06 +08:00
gaoxin 8a960ece3b 【关卡】添加剧情关卡 2021-12-02 01:06:34 +08:00
jiaoyangna 9a61491b90 资源条修改提交 2021-11-27 18:28:11 +08:00
jiaoyangna f036036f09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 18:13:03 +08:00
jiaoyangna 5fb0af7e00 颜色修改提交 2021-11-27 18:12:37 +08:00
jiaoyangna da2cff54a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:59:23 +08:00
jiaoyangna 07057901bc 十连抽修改 2021-11-27 17:59:07 +08:00
wangzhenxing dcd16e5450 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:50:09 +08:00
ZhangBiao 27abdede9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:21:33 +08:00
ZhangBiao 14b6087d77 【神将来源】获取途径报错修改 2021-11-27 17:21:24 +08:00
wangzhenxing 58f41eb758 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:18:38 +08:00
wangzhenxing dd248f37f6 [角色朝向]======进阶展示,皮肤显示,好感度 2021-11-27 17:18:04 +08:00
jiaoyangna dfb79c03d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:14:47 +08:00
jiaoyangna 37de4c4450 文字显示报错修改 2021-11-27 17:13:28 +08:00
ZhangBiao a8e619b8c6 【乾坤宝盒】去除珍奇宝阁 2021-11-27 17:03:58 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
wangzhenxing d099ddafa3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:35:13 +08:00
ZhangBiao 1775784bcd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:34:59 +08:00
wangzhenxing bc39b34a73 [战中表现]=====角色释放技能表现位置修改 2021-11-27 16:34:46 +08:00
gaoxin 58ce5ad4d8 【战斗】测试战斗跳过按钮遮挡 2021-11-27 16:28:54 +08:00
wangzhenxing 0ce834e220 【立绘朝向】=====备战界面修改,战斗记录界面灵兽显示主角修改 2021-11-27 16:25:21 +08:00
jiaoyangna ae826de307 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:16:38 +08:00
luyao e4f02f3c7c 【神将头像t1左>右】【神将缩微图t3 部分左>右】 2021-11-27 16:16:01 +08:00
jiaoyangna 41ae610a31 变身卡界面修改提交 2021-11-27 16:14:59 +08:00
wangzhenxing cbcead2f50 【身外化身】=======化身位置修改 2021-11-27 15:45:21 +08:00
jiaoyangna 12e091408d 层级修改 2021-11-27 15:37:48 +08:00
ZhangBiao d8956e0fe2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:31:17 +08:00
ZhangBiao b83dc76f7b 【灵兽特惠】时间显示修改 2021-11-27 15:30:49 +08:00
jiaoyangna 904adf1d16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:30:02 +08:00
jiaoyangna e9862a7046 抽卡提示修改提交 2021-11-27 15:29:46 +08:00
gaoxin 2061e3ae03 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:17:09 +08:00
gaoxin ee5b4a79a8 【资源】图片大小优化 2021-11-27 15:16:57 +08:00
wangzhenxing d639b2d29b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:15:00 +08:00
wangzhenxing 85a12ae9d8 [身外化身]========身外化身立绘朝向修改 2021-11-27 15:14:22 +08:00
gaoxin d253668aef 【战斗】修复按钮被立绘遮挡 2021-11-27 15:13:35 +08:00
luyao d4b6fdb128 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:04:09 +08:00
luyao d6678a0246 【资源】卡牌左->右 2021-11-27 15:03:54 +08:00
luyao 03c313b6c9 【音效】妖道普通攻击音效 2021-11-27 15:00:31 +08:00
gaoxin f86bb0d997 【特效】人道 transform -> rectTransform 2021-11-27 14:57:31 +08:00
gaoxin a5fb77cf9d 【特效】人道 transform -> rectTransform 2021-11-27 14:57:15 +08:00
gaoxin 72cd7fde38 【特效】四阵营普攻特效优化 人 道 2021-11-27 14:41:54 +08:00
gaoxin bf3e7d0d14 【特效】四阵营普攻特效优化 人 道 2021-11-27 14:39:28 +08:00
jiaoyangna f6c0b80512 位置修改提交 2021-11-27 14:32:57 +08:00
jiaoyangna ecc3aff607 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 14:31:17 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
wangzhenxing fd81a89c96 【战斗表现】========变身卡展示位置修改 2021-11-27 13:56:37 +08:00
jiaoyangna 767d4589c7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 13:54:56 +08:00
skuld e520475181 bat Resource Commit:2021/12/03,13:38:14 2021-12-03 13:38:14 +08:00
jiaoyangna 04987414e9 图片修改提交 2021-11-27 13:54:36 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
wangzhenxing c80968098c 【立绘朝向】=============装备界面立绘朝向 2021-11-27 13:01:27 +08:00
gaoxin 060a380305 【战斗】跳过按钮进度显示优化 2021-11-26 19:41:10 +08:00
jiaoyangna 83946b29f2 变身卡详情修改提交 2021-11-26 19:37:27 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
jiaoyangna 97c23fb3cb 变身卡自选箱修改提交 2021-11-26 18:51:56 +08:00
jiaoyangna dd232c96d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 18:30:39 +08:00
jiaoyangna 5bba220ad5 添加跳转 2021-11-26 18:30:08 +08:00
gaoxin 41d60d9f5e 【特效】修复道特效显示错误 2021-11-26 18:26:54 +08:00
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
ZhangBiao df360d853d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:26:40 +08:00
ZhangBiao bb7c738cd1 【每日礼包】banner修改 2021-11-26 17:26:30 +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 f1d4a449b0 【资源提交】 2021-11-26 16:30:26 +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 044137ed72 【音效】新普通攻击音效 2021-11-26 15:08:00 +08:00
gaoxin 08055eebde 【音效】新普通攻击音效 2021-11-26 15:07:37 +08:00
gaoxin 7988001d99 【特效】资源名变化 2021-11-26 14:29:30 +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 92e8420ec1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 13:09:12 +08:00
jiaoyangna a15ca8407e 标题位置调整 2021-11-26 13:08:48 +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 fcf7868ab7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:37:38 +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
gaoxin bd423ffbd6 【资源】资源名称重复 2021-11-26 11:35:48 +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
gaoxin ae03cddcc9 【特效】四阵营普攻优化 2021-11-26 11:28:44 +08:00
gaoxin 70d9b2e120 【资源】资源名重复修改 2021-11-26 11:27:50 +08:00
wangzhenxing bb1402d5e7 [战斗]======立绘方向修改 2021-11-26 11:24:46 +08:00
gaoxin 28c9748716 【特效】四阵营普攻优化 2021-11-26 11:17:45 +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
ZhangBiao 8c7d2e935e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 10:34:49 +08:00
ZhangBiao 7ef385ac53 【固定活动】提交 2021-11-26 10:34:41 +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