Commit Graph

5739 Commits (2da00831ed3dd4c00184c76a95521340b15a7ec3)
 

Author SHA1 Message Date
ZhangBiao d1a1d922c1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-04-27 14:34:52 +08:00
zhangqiang b000e84564 【超值基金】判断是否可购买 修改 2 2021-04-27 14:34:29 +08:00
ZhangBiao 014623000f 表数据 2021-04-27 14:34:06 +08:00
ZhangBiao df76a49401 【碎片自选箱】通过道具详情跳转别的地方,返回后选中标识居中 2021-04-27 14:33:25 +08:00
gaoxin c73f7b4fbc 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
gaoxin 555d046748 Merge branch 'china/dev' into china/dev-c 2021-04-27 14:16:46 +08:00
gaoxin b09a71eed4 【战斗】多余显示关闭 2021-04-27 14:16:20 +08:00
jiaoyangna c3ee907f50 Merge branch '剧情' into china/dev 2021-04-27 14:12:11 +08:00
jiaoyangna 1537410e05 剧情提交 2021-04-27 14:06:04 +08:00
ZhangBiao eb7d89578a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 13:48:29 +08:00
ZhangBiao 74b2ef62ca 【恭喜获得】提交 2021-04-27 13:48:17 +08:00
gaoxin 721eadfa98 【踏碎凌霄】修复怒气显示大小错误 2021-04-27 13:44:03 +08:00
gaoxin 533885679c 【踏碎凌霄】boss放大添加 2021-04-27 13:32:41 +08:00
gaoxin 854c11affc Merge remote-tracking branch 'origin/china/dev-c' into china/dev 2021-04-26 20:49:43 +08:00
ZhangBiao cf1cf818e2 【战斗界面】上方血条移仓 2021-04-26 20:45:42 +08:00
ZhangBiao 171da338df Revert "【战斗界面】上方血条问题修改"
This reverts commit 46d492529f.
2021-04-26 20:44:08 +08:00
ZhangBiao 91a569d918 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 20:42:58 +08:00
ZhangBiao 46d492529f 【战斗界面】上方血条问题修改 2021-04-26 20:42:49 +08:00
zhangqiang 3d1857dfcd 【前端拍脸修改】提交——2 2021-04-26 20:35:54 +08:00
zhangqiang 460ec366cb 【礼包】去掉LevelLinit 字段判断 2021-04-26 20:27:29 +08:00
zhangqiang ca9594fefc 【超值基金】是否可购买判断修改 2021-04-26 20:08:32 +08:00
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
jiaoyangna 8b8d0a3956 剧情 提交 2021-04-26 18:57:54 +08:00
ZhangBiao 24937470ad Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 18:46:27 +08:00
ZhangBiao 90fbe78773 【积天豪礼】提交 2021-04-26 18:46:19 +08:00
jiaoyangna 637aa36041 剧情提交 2021-04-26 18:29:47 +08:00
gaoxin 7df1514da8 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-26 17:55:43 +08:00
ZhangBiao 2770e6da31 Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-04-26 17:18:02 +08:00
ZhangBiao 73588be932 【踏碎凌霄】 2021-04-26 17:12:39 +08:00
ZhangBiao 8269afe74d 【踏碎凌霄】回访 2021-04-26 16:53:36 +08:00
ZhangBiao 98f12190ea 【踏碎凌霄】 2021-04-26 16:46:03 +08:00
ZhangBiao 31b9eb3057 【踏碎凌霄】 2021-04-26 16:20:22 +08:00
wangzhenxing 62112ecff0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 15:45:43 +08:00
wangzhenxing ebde6e43b0 [功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能 2021-04-26 15:45:30 +08:00
zhangqiang cccc067c41 【特权商城光效】跳转至特权商城后,对应特权上的光效消失 2021-04-26 15:19:56 +08:00
zhangqiang 154e048796 【十五日登陆】无可领取奖励时,入口消失 2021-04-26 15:19:11 +08:00
zhangqiang b4ed183fc6 【前端拍脸修改】提交——1 2021-04-26 13:44:31 +08:00
zhangqiang 26e63d7c9e 【月卡】累冲金额调整 2021-04-26 12:11:02 +08:00
wangzhenxing bbbf5598d6 立绘图片资源替换 2021-04-26 11:11:46 +08:00
jiaoyangna f38e838967 特权商城跳转到对应礼包位置 2021-04-26 10:38:57 +08:00
ZhangBiao b0d0fab6d5 【踏碎凌霄】提交 2021-04-26 10:23:19 +08:00
wangzhenxing 7a5d44a8f2 【战斗】============被动313修改 2021-04-26 10:00:11 +08:00
jiaoyangna 15ef116032 剧情提交 2021-04-26 09:41:41 +08:00
gaoxin e25750d948 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 21:30:31 +08:00
gaoxin 2a4b70f212 【回放】修复战斗回放时报错 2021-04-25 21:30:25 +08:00
wangzhenxing 324c93e93f 【战斗】==============被动313修改 2021-04-25 19:50:54 +08:00
gaoxin 9874f5b42a 【新人商城】法宝直升25级提示添加 2021-04-25 19:26:58 +08:00
gaoxin 4ebd3d79f6 【限时神装】文字资源提花 2021-04-25 17:41:48 +08:00
ZhangBiao 072b7713c2 【恭喜获得】界面结构调整 2021-04-25 17:40:49 +08:00
gaoxin f9df42a165 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-25 17:01:43 +08:00