Commit Graph

2936 Commits (73d92664de67b484579dda056f7e29df19760508)

Author SHA1 Message Date
wangzhenxing 73d92664de [飞升]=======飞升逻辑提交 2021-12-28 16:20:07 +08:00
wangzhenxing 380b0bdb78 [飞升]=============飞升代码提交 2021-12-27 16:39:38 +08:00
gaoxin d10d2f976a 【装备合成】添加输入改变合成数量的功能 2021-12-30 22:19:09 +08:00
skuld 606bedd85c 【挂机】新人商城按钮效果修改 2021-12-23 17:43:36 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
ZhangBiao e6d1ac6ef0 【修行】冲突修改 2021-12-23 09:53:00 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
jiaoyangna 85795f19cc 适配修改提交 2021-12-21 18:12:15 +08:00
jiaoyangna 99ca3a60eb 适配修改提交 2021-12-21 18:10:34 +08:00
jiaoyangna edbf25dc59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-21 17:21:26 +08:00
jiaoyangna 89fdc69afd 添加拍脸提交 2021-12-21 17:21:10 +08:00
ZhangBiao b9bb2cf544 【修行】星数到达四位后只显示三位 2021-12-21 13:23:16 +08:00
wangzhenxing 885a6e2fa8 [功能]========结算记录界面添加阵亡标签 2021-12-20 15:32:28 +08:00
jiaoyangna cddbe10d1a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 14:15:29 +08:00
jiaoyangna d1fd74db04 【ID1019430】
【神将回退】光效穿透
2021-12-20 14:15:14 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
ZhangBiao 6d93ab7dca Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 14:05:56 +08:00
ZhangBiao 8b7b5c8fa9 【连购礼包】无礼包修改 2021-12-20 14:05:42 +08:00
jiaoyangna 7002f1ac42 关卡提示修改 2021-12-20 13:10:58 +08:00
ZhangBiao 834cdf87da 【新将来袭】取消珍奇宝阁 2021-12-17 18:59:54 +08:00
ZhangBiao 0377b2b642 【特惠商城】提交 2021-12-17 18:53:24 +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 f441e7a7ea 适配修改提交 2021-12-17 18:13:14 +08:00
jiaoyangna 6573b10a59 资源提交 2021-12-17 17:42:00 +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 ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +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
ZhangBiao d5ae25820d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:00:15 +08:00
ZhangBiao d939e6b32b 【新人商城】提交 2021-12-17 14:00:07 +08:00
jiaoyangna 2f489fecad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 13:29:24 +08:00
gaoxin 717e5f3411 【关卡】解锁提示按钮组件添加 2021-12-27 13:20:59 +08:00
jiaoyangna 4fdd4e7b62 跳转修改提交 2021-12-17 13:29:08 +08:00
gaoxin ab3d7e939b 【解锁提示】添加功能解锁提示 2021-12-26 19:12:25 +08:00
jiaoyangna 740aeac6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 18:43:36 +08:00
gaoxin eaea265bc7 【物品】添加物品使用的限制等级 2021-12-26 17:35:50 +08:00
jiaoyangna 19a1e1b7ca 超值返利提交 2021-12-16 18:41:30 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00
ZhangBiao b203711459 Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-16 17:17:16 +08:00
gaoxin cb8f8fe0aa 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
jiaoyangna 50927b9ac5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 16:55:46 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00