Commit Graph

11590 Commits (fb8de57afaa581f8460d5d01c6e3c4bd8cf4d960)
 

Author SHA1 Message Date
jiaoyangna 76c682eb68 【神将回退】将魂足够升星时,进阶页签不显示红点 2021-12-20 12:05:11 +08:00
jiaoyangna b7b71930f5 进阶预览黑屏修改提交 2021-12-20 11:33:36 +08:00
jiaoyangna 5148c3fb85 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 11:32:39 +08:00
jiaoyangna bf73593d04 进阶预览提交 2021-12-20 11:32:23 +08:00
ZhangBiao 9fa6f3a2b3 【奖励详情】报错修改 2021-12-20 10:30:51 +08:00
wangzhenxing e02f9a7881 [战斗]======角色播放 skill 动作逻辑提交 2021-12-20 10:02:38 +08:00
ZhangBiao 834cdf87da 【新将来袭】取消珍奇宝阁 2021-12-17 18:59:54 +08:00
ZhangBiao 795d19d63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:53:34 +08:00
ZhangBiao 0377b2b642 【特惠商城】提交 2021-12-17 18:53:24 +08:00
jiaoyangna 415fc7cb35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:46:19 +08:00
jiaoyangna e6796ee70f 超值返利修改提交 2021-12-17 18:46:05 +08:00
ZhangBiao 034aff624f 【资源】提交 2021-12-17 18:36:47 +08:00
ZhangBiao 38966d1b16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:35:40 +08:00
ZhangBiao 72b0f31d50 【特惠商城】提交 2021-12-17 18:25:45 +08:00
jiaoyangna 82712c6047 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:13:42 +08:00
jiaoyangna f441e7a7ea 适配修改提交 2021-12-17 18:13:14 +08:00
luyao 44eb9decb8 【至尊降世】豪华月卡图标 2021-12-17 18:11:25 +08:00
jiaoyangna 196cb329b3 提示文字修改提交 2021-12-17 17:48:26 +08:00
jiaoyangna 4a9463fe5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:42:19 +08:00
jiaoyangna 6573b10a59 资源提交 2021-12-17 17:42:00 +08:00
wangzhenxing ef680be056 [战斗]======护盾效果修改 2021-12-17 17:31:58 +08:00
ZhangBiao 88980286eb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:20:24 +08:00
ZhangBiao 08806bc18f 【寻仙招募】改为常驻后,奖励中的概率有效期去掉 2021-12-17 17:20:13 +08:00
jiaoyangna 5c042b2c60 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:19:58 +08:00
jiaoyangna 893cd69527 特效被切修改提交 2021-12-17 17:19:30 +08:00
ZhangBiao df483145bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:13:57 +08:00
ZhangBiao a9b7c21fad 【道具弹窗】跳转按钮错位 2021-12-17 17:13:45 +08:00
jiaoyangna 7e444d54c6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 16:55:50 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
jiaoyangna a16931b9dc 文字位置修改提交 2021-12-17 16:55:23 +08:00
jiaoyangna 6b234c7f2f 文字重叠修改提交 2021-12-17 16:53:26 +08:00
jiaoyangna 3119f9b277 价格描述修改 2021-12-17 16:43:24 +08:00
jiaoyangna 16c00cbffc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 16:41:26 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao 8ad3346af9 【特惠商城】 2021-12-17 16:05:51 +08:00
ZhangBiao 80d4df7add 【命格】冲突提交 2021-12-17 15:49:55 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
wangzhenxing 9c07c341e5 【资源】===嫦娥新动作提交 2021-12-17 15:08:30 +08:00
ZhangBiao 0e732fa8b6 【新人商城】结束后关闭 2021-12-17 14:44:44 +08:00
ZhangBiao 2eb83d4c63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:13:53 +08:00
ZhangBiao d34d896f47 【成长礼包】提交 2021-12-17 14:13:41 +08:00
gaoxin db2d3c8433 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-27 14:01:06 +08:00
gaoxin 1c9d3caa75 【罗浮】原罗浮商店跳转到逐胜商店 2021-12-27 14:00:47 +08:00
gaoxin c393143cb6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-27 13:41:21 +08:00
gaoxin d1ee1455eb 【罗浮货币】跨服天梯 罗浮晶石1207->逐胜徽章24 2021-12-27 13:41:06 +08:00
gaoxin 717e5f3411 【关卡】解锁提示按钮组件添加 2021-12-27 13:20:59 +08:00
gaoxin 5bfb89d276 【关卡挂机】未解锁跳转功能添加 2021-12-27 13:11:33 +08:00
jiaoyangna 1a8f01c2fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:12:13 +08:00
jiaoyangna 94d2e1852f 超值返利 2021-12-17 14:11:49 +08:00
jiaoyangna 83b1fad0b7 跳转修改提交 2021-12-17 14:11:03 +08:00