Commit Graph

59 Commits (d326af4c5186f6277b8d11c6a6f2ce770746849a)

Author SHA1 Message Date
gaoxin be1ce2a189 【场景】添加开天新包配置 2021-12-22 15:15:02 +08:00
gaoxin 25c9e3472a 【场景】quick新母包场景创建 2021-11-30 11:23:31 +08:00
gaoxin 2a5c5962e8 【开天专服】打包场景添加 2021-11-16 16:31:12 +08:00
gaoxin da07b59ad8 【蓝鲸商务包场景提交】 2021-11-09 11:52:28 +08:00
gaoxin 7822274c0c 【出包场景】新增游心的第二个包的出包场景 2021-10-21 13:48:43 +08:00
gaoxin 2da3f4b8e5 【Logo】删除SDKConfig 2021-08-30 15:35:14 +08:00
gaoxin 3a8fac4f87 【修复数数SDK升级导致本地报错】 2021-08-30 12:29:13 +08:00
gaoxin fe43c56647 【出包场景】所有线上包关闭日志打印 2021-08-24 17:29:19 +08:00
jiaoyangna 4d8bf852d4 Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
2021-07-19 14:10:11 +08:00
jiaoyangna 01b3f79c43 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40 2021-07-19 14:09:40 +08:00
zhangqiang baf39fc1a3 【动游】场景 2021-07-19 11:02:25 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
zhangqiang e4469de1c3 【游心】场景提交 2021-07-14 16:01:05 +08:00
JLIOSM1 d94dd117e4 【场景】添加国内正式服打包场景 2021-07-13 18:28:00 +08:00
zhangqiang 8bc03131ee 【太初行渠道quick】场景提交 2021-06-26 13:52:28 +08:00
gaoxin 5cf66021e2 【打包】quick打包场景提交 2021-06-24 13:47:44 +08:00
gaoxin 562b57db73 【场景】新增猕猴桃商务出包场景 2021-06-17 10:59:20 +08:00
JieLing 0f0ba0dfc2 【包配置】灵动正式服数数appid修改 2021-06-10 22:53:46 +08:00
JieLing f25cd6531c 【包配置】灵动包相关参数配置 2021-06-09 15:33:19 +08:00
zhangqiang 4e91eda734 【弥核桃专服场景】 2021-06-09 09:39:37 +08:00
gaoxin 1b55441abc 【配置】新增草花渠道相关配置 2021-06-07 16:49:58 +08:00
gaoxin 2f0208ec73 【工具】添加c-v2测试包配置 2021-06-03 14:39:36 +08:00
gaoxin 3645d39b93 【场景】添加喜扑入口场景 2021-05-31 15:29:10 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
gaoxin 0f4e90d585 【场景】添加特效制作的场景 2021-05-12 17:18:16 +08:00
zhangqiang 6bb5aeefe8 【混淆】工具添加 2021-04-19 21:15:53 +08:00
gaoxin 145eb02c06 【策划场景】灵兽战斗中添加名字显示 2021-03-23 15:04:33 +08:00
gaoxin c40b734145 【策划场景】灵兽立绘调整界面添加 2021-03-23 14:42:14 +08:00
JieLing 905e60e306 【场景】测试服场景上传 2021-03-20 22:11:33 +08:00
gaoxin 40bfa7c586 【配置】国内相关修改 2021-03-17 17:30:13 +08:00
gaoxin ee6fde0370 【策划场景】修改战斗中立绘的配置方式 2021-03-10 11:53:07 +08:00
JieLing 6d8b00b5af IOS场景添加 2020-09-21 17:07:04 +08:00
JieLing 86feac0023 Merge branch 'master_develop' into master_tishen_hw
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2020-09-04 15:08:23 +08:00
zhangqiang 4d6a9afa63 场景提交 2020-09-04 15:01:59 +08:00
JieLing a5b334a47d 海外正式服logo配置 2020-08-28 17:00:20 +08:00
JieLing f9d4330524 提审服配置添加 2020-08-28 16:56:34 +08:00
JieLing 6da8bdb3ae 打包配置提交 2020-08-28 16:09:41 +08:00
JieLing 2ef85759a1 无敌盾,眩晕效果添加 2020-08-25 15:49:52 +08:00
zhangqiang f0c1ad1b71 首冲 2020-08-25 15:09:53 +08:00
gaoxin e79d5ce4db 删除bugl配置 2020-07-30 11:01:41 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
JieLing cd43d2417f 内网测试 0.16.1 2020-07-25 15:13:59 +08:00
JieLing 2164aacc49 内网包配置修改 2020-07-25 14:52:41 +08:00
JieLing 2899bb433c 猕猴桃 测试服 0.1.1 2020-07-23 21:32:12 +08:00
JieLing 13fd2b45a5 一些相关配置文件提交 2020-07-22 22:21:18 +08:00
JieLing d10581150a sdk修改配置 2020-07-13 16:47:39 +08:00
gaoxin 3f54c121b1 sdk=接口完善 2020-07-13 12:25:55 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
JieLing ab411b3d0d svn逻辑同步 2020-07-02 17:04:46 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00