Commit Graph

11514 Commits (e34092f93dbf44dfade3e27fe57a8938b6ce01fc)
 

Author SHA1 Message Date
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
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
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 abb3c4ec5f 跳转修改提交 2021-12-17 13:30:45 +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
jiaoyangna 4fdd4e7b62 跳转修改提交 2021-12-17 13:29:08 +08:00
ZhangBiao f4b2a09f08 【商城界面】和信任商城 2021-12-17 12:08:15 +08:00
ZhangBiao 17b286b890 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 11:28:47 +08:00
ZhangBiao 45241e1d5d 【商城界面】提交 2021-12-17 11:28:37 +08:00
gaoxin 7d02fd5394 【解锁提示】添加解锁条件显示 2021-12-27 09:58:34 +08:00
jiaoyangna ab01f4ab25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 11:23:11 +08:00
jiaoyangna ec53e8ad84 超值返利提交 2021-12-17 11:22:54 +08:00
ZhangBiao e580889f3f 【商城界面】无剩余次数修改 2021-12-17 09:56:48 +08:00
ZhangBiao 052d7418ca 【商城界面】提交 2021-12-17 09:31:45 +08:00
ZhangBiao 2cb1af4c8b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 19:22:57 +08:00
gaoxin ab3d7e939b 【解锁提示】添加功能解锁提示 2021-12-26 19:12:25 +08:00
ZhangBiao 5393485f65 【商城界面】提交 2021-12-16 19:22:46 +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 f0d9f4828f 【关卡新条件】条件显示在按钮上 2021-12-26 18:13:39 +08:00
skuld 7476af5fd9 bat Resource Commit:2021/12/18, 0:15:30 2021-12-18 00:15:31 +08:00
gaoxin 26a1bc539d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-26 17:36:04 +08:00
gaoxin eaea265bc7 【物品】添加物品使用的限制等级 2021-12-26 17:35:50 +08:00
gaoxin 22a1e695b9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-26 17:29:25 +08:00
gaoxin acf5e8e31a 【挂机物品】导致其他物品显示错误 2021-12-26 17:29:06 +08:00
gaoxin cb8f8fe0aa 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
jiaoyangna 19a1e1b7ca 超值返利提交 2021-12-16 18:41:30 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00