Commit Graph

6194 Commits (0332366e9d116e9ec40223efc5a61da578115168)
 

Author SHA1 Message Date
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
ZhangBiao 7f19809419 【修行】提交 2021-05-20 20:12:01 +08:00
ZhangBiao e51378ab3b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 18:00:53 +08:00
ZhangBiao 46cc1d9591 【修行】限制特权入口,增加仙尘加号 2021-05-20 18:00:45 +08:00
zhangqiang 02b3f94761 【首领关卡】不允许跳过提示修改 2021-05-20 17:50:44 +08:00
ZhangBiao b22b8abd6a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 17:38:07 +08:00
ZhangBiao b1e7cd1164 【修行】提交 2021-05-20 17:37:56 +08:00
zhangqiang 97ba718ac2 Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-05-20 17:32:06 +08:00
gaoxin 243240d803 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 16:51:34 +08:00
gaoxin 239f8c50e4 【社稷大典】奖励提示添加 2021-05-20 16:51:09 +08:00
zhangqiang 4b2259d65a 【山河社稷图】加副关卡编队 2021-05-20 16:46:26 +08:00
gaoxin 6f0132e18d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 16:12:20 +08:00
gaoxin bd27d190ac 【屏幕适配】部分界面优化 2021-05-20 16:12:15 +08:00
zhangqiang fc1dc60119 【特权加等级奖励】4 2021-05-20 16:11:18 +08:00
zhangqiang 90bba41910 【特权加等级奖励】3 2021-05-20 15:47:15 +08:00
gaoxin 16596f733d 【竞技场】免费次数提示添加 2021-05-20 14:59:40 +08:00
gaoxin 3007dafa27 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 14:37:05 +08:00
gaoxin 0bc7a1d3e8 【资源】修复新增spine动画的动作问题 2021-05-20 14:36:40 +08:00
zhangqiang ede26383c8 【特权加等级奖励】2 2021-05-20 14:19:29 +08:00
zhangqiang 80183cd5a0 【特权加等级奖励】1 2021-05-20 14:18:48 +08:00
ZhangBiao ae10b715cd 【修行】神印界面提交 2021-05-20 11:57:27 +08:00
ZhangBiao 40cafcca32 【修行】神印界面结构修改 2021-05-20 11:18:42 +08:00
ZhangBiao e416d30107 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 10:55:48 +08:00
ZhangBiao 5ea5e5b689 【修行】紫府神印界面添加资源 2021-05-20 10:55:33 +08:00
gaoxin f67e673401 【资源】立绘提交 2021-05-20 10:19:09 +08:00
ZhangBiao 3f7e243b70 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
ZhangBiao 2870091514 Merge branch 'china/dev-c' into 0功能/修行玩法 2021-05-19 20:53:37 +08:00
ZhangBiao 098ab986e4 【修行】meta提交 2021-05-19 20:43:16 +08:00
zhangqiang 189ed98688 【拍脸灵兽推送礼包】 2021-05-19 20:40:33 +08:00
jiaoyangna 981d945ece Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-19 20:28:24 +08:00
gaoxin 11c0d5f2a5 【引导】修复不明原因引导小手消失的问题 2021-05-19 20:21:07 +08:00
ZhangBiao be1085d2bb Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
2021-05-19 20:01:57 +08:00
ZhangBiao 00cdcffd23 【修行】图片meta提交 2021-05-19 19:55:02 +08:00
ZhangBiao a93b2391e6 【修行】提交 2021-05-19 19:53:00 +08:00
gaoxin 00d42ca8d9 【本地化】导出lua文本时,不再对没有变化的文件进行写操作 2021-05-19 19:47:39 +08:00
gaoxin ab4baa0420 【meta】 2021-05-19 19:46:52 +08:00
ZhangBiao 7d5de9d23a 【修行】恭喜破镜 2021-05-19 18:27:57 +08:00
gaoxin e205ee9a7c 【踏碎凌霄】背景资源类型修改 2021-05-19 17:55:57 +08:00
gaoxin 0b11346906 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-19 17:51:44 +08:00
gaoxin 17d453dd51 【乾坤商店】修复消耗品显示白片的问题 2021-05-19 17:51:40 +08:00
jiaoyangna 2020d3aa18 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-19 17:41:03 +08:00
jiaoyangna e295c16960 图片提交 2021-05-19 17:40:01 +08:00
zhangqiang 029ea47266 【山河社稷图】图片加载 2021-05-19 17:36:43 +08:00
gaoxin 417dcbf116 【bug】修复幸运探宝界面打不开的wenti 2021-05-19 17:26:50 +08:00
gaoxin 30372368f6 【资源】特惠商城资源格式修改 2021-05-19 17:11:37 +08:00
ZhangBiao 3bb85fd5db 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00
ZhangBiao e491f58adc 【修行】提交 2021-05-19 16:14:09 +08:00
gaoxin a092534a16 【工具】图片整理工具优化 2021-05-19 16:06:43 +08:00
gaoxin 5f7aaf6a57 【公告】修复界面销毁后再打开报错的问题 2021-05-19 16:05:29 +08:00
zhangqiang ebcc753925 【山河社稷图】小关卡等级限制提示 2021-05-19 15:53:23 +08:00